diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_RentIn_DetailReq.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_RentIn_DetailReq.cs new file mode 100644 index 00000000..ac7b6bc8 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_RentIn_DetailReq.cs @@ -0,0 +1,127 @@ +using DS.Module.Core; +using DS.WMS.Core.Op.Entity; +using FluentValidation; +using SqlSugar; + +namespace DS.WMS.ContainerManagement.Info.Dtos; + +/// +/// 箱管_租箱租入 请求实体 +/// +public class CM_RentIn_DetailReq +{ + /// + /// 主键Id + /// + public long Id { get; set; } + /// + /// 租箱业务id + /// + public long Pid { get; set; } + + /// + /// Desc:租箱业务号 + /// + public string Billno { get; set; } + + /// + /// Desc:箱号 + /// + public string Cntrno { get; set; } + + /// + /// Desc:箱型 + /// + public string Ctnall { get; set; } + + + /// + /// Desc:原箱主 + /// + public string OldContainerOwner { get; set; } + + + + /// + /// Desc:租箱业务 租入0/租入退租1 + /// + public string CMRentDirectEnum { get; set; } + + /// + /// Desc:租箱类型 长租1 短租0 单程2 + /// + public string RentType { get; set; } + + /// + /// Desc:业务状态 + /// + public string BillState { get; set; } + + + /// + /// Desc:关联放箱单号 + /// + public string CtnReleaseNo { get; set; } + + + /// + /// Desc:租入日期 + /// + public DateTime? Bsdate { get; set; } + + /// + /// Desc:开始计费日期 + /// + public string FeeStartDate { get; set; } + + /// + /// Desc:币别 + /// + public string Currenty { get; set; } = "USD"; + + + /// + /// Desc:日租金 + /// + public decimal? Dailyrate { get; set; } = 0M; + + + /// + /// Desc:提箱费 + /// + public decimal? PickupFee { get; set; } = 0M; + + /// + /// Desc:还箱费 + /// + public decimal? DropoffFee { get; set; } = 0M; + + + /// + /// Desc:还箱日期 + /// + public DateTime? DropoffDate { get; set; } + + + /// + /// Desc:提箱港口 + /// + public string PickupPortid { get; set; } + + + + /// + /// Desc:还箱港口 + /// + public string DropoffPortid { get; set; } + + /// + /// Desc:业务编号/提单号 + /// + public string Mblno { get; set; } + + /// + /// Desc:船名航次 + /// + public string VesselVoyno { get; set; } +} diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_RentIn_DetailRes.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_RentIn_DetailRes.cs new file mode 100644 index 00000000..de92c825 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Dtos/CM_RentIn_DetailRes.cs @@ -0,0 +1,41 @@ +using DS.Module.Core; +using DS.WMS.Core.Op.Entity; +using SqlSugar; + +namespace DS.WMS.ContainerManagement.Info.Dtos; + +/// +/// 箱管_租箱租入 返回实体 +/// +public class CM_RentIn_DetailRes +{ + /// + /// 主键Id + /// + public long Id { get; set; } + /// + /// Desc:集装箱号 + /// + public string Cntrno { get; set; } + + public BusinessType BusinessType { get; set; } = BusinessType.CM_RentIn; + /// + /// Desc:箱型 + /// + public string Ctnall { get; set; } + + /// + /// Desc:箱皮重 + /// + public decimal? CtnWeight { get; set; } + + /// + /// Desc:箱生产时间 + /// + public DateTime? ProductionDate { get; set; } + + /// + /// Desc:箱初期成本 + /// + public decimal? CtnValue_Base { get; set; } +} \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentIn.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentIn.cs index e87f2679..bb1f9421 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentIn.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentIn.cs @@ -14,7 +14,7 @@ public class CM_RentIn : BaseOrgModel /// Desc:租箱业务号 /// [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false, Length = 20)] - public string Custno { get; set; } + public string Billno { get; set; } /// /// Desc:租箱退租 @@ -34,11 +34,6 @@ public class CM_RentIn : BaseOrgModel [SugarColumn(ColumnDescription = "业务状态", IsNullable = true, Length = 20)] public string BillState { get; set; } - /// - /// Desc:业务所属分部 - /// - [SugarColumn(ColumnDescription = "业务所属分部", IsNullable = true, Length = 50)] - public string Corpid { get; set; } /// /// Desc:原箱主 @@ -62,12 +57,12 @@ public class CM_RentIn : BaseOrgModel /// /// Desc:是否业务锁定 /// - [SugarColumn(ColumnDescription = "是否业务锁定", DefaultValue = "0")] + [SugarColumn(ColumnDescription = "是否业务锁定", IsNullable = false, DefaultValue = "0")] public bool? IsBusinessLocking { get; set; } = false; /// /// Desc:是否费用锁定 /// - [SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")] + [SugarColumn(ColumnDescription = "是否费用锁定", IsNullable = false, DefaultValue = "0")] public bool? IsFeeLocking { get; set; } = false; /// diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentIn_Detail.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentIn_Detail.cs new file mode 100644 index 00000000..3a228725 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentIn_Detail.cs @@ -0,0 +1,144 @@ +using DS.Module.Core; +using DS.Module.Core.Data; +using SqlSugar; + +namespace DS.WMS.ContainerManagement.Info.Entity; + +/// +/// 箱管_租箱租入明细 +/// +[SqlSugar.SugarTable("CM_RentIn_Detail", "箱管_租箱租入明细")] +public class CM_RentIn_Detail : BaseOrgModel +{ + /// + /// 租箱业务id + /// + [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false)] + public long Pid { get; set; } + + /// + /// Desc:租箱业务号 + /// + [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false, Length = 20)] + public string Billno { get; set; } + + /// + /// Desc:箱号 + /// + [SugarColumn(ColumnDescription = "箱号", IsNullable = false, Length = 20)] + public string Cntrno { get; set; } + + /// + /// Desc:箱型 + /// + [SugarColumn(ColumnDescription = "箱型", IsNullable = false, Length = 20)] + public string Ctnall { get; set; } + + + /// + /// Desc:原箱主 + /// + [SugarColumn(ColumnDescription = "原箱主", IsNullable = true, Length = 50)] + public string OldContainerOwner { get; set; } + + + + /// + /// Desc:租箱业务 租入0/租入退租1 + /// + [SugarColumn(ColumnDescription = "租箱类型", IsNullable = true, Length = 20)] + public string CMRentDirectEnum { get; set; } + + /// + /// Desc:租箱类型 长租1 短租0 单程2 + /// + [SugarColumn(ColumnDescription = "租箱类型", IsNullable = true, Length = 20)] + public string RentType { get; set; } + + /// + /// Desc:业务状态 + /// + [SugarColumn(ColumnDescription = "业务状态", IsNullable = true, Length = 20)] + public string BillState { get; set; } + + + /// + /// Desc:关联放箱单号 + /// + [SugarColumn(ColumnDescription = "关联放箱单号", IsNullable = true, Length = 50)] + public string CtnReleaseNo { get; set; } + + + /// + /// Desc:租入日期 + /// + [SugarColumn(ColumnDescription = "业务日期", IsNullable = true, Length = 20)] + public DateTime? Bsdate { get; set; } + + /// + /// Desc:开始计费日期 + /// + [SugarColumn(ColumnDescription = "开始计费日期", IsNullable = true, Length = 7)] + public string FeeStartDate { get; set; } + + /// + /// Desc:币别 + /// + [SugarColumn(ColumnDescription = "币别", IsNullable = true, Length = 7)] + public string Currenty { get; set; } = "USD"; + + + /// + /// Desc:日租金 + /// + [SugarColumn(ColumnDescription = "日租金", IsNullable = true, Length = 20)] + public decimal? Dailyrate { get; set; } = 0M; + + + /// + /// Desc:提箱费 + /// + [SugarColumn(ColumnDescription = "提箱费", IsNullable = true, Length = 20)] + public decimal? PickupFee { get; set; } = 0M; + + /// + /// Desc:还箱费 + /// + [SugarColumn(ColumnDescription = "还箱费", IsNullable = true, Length = 20)] + public decimal? DropoffFee { get; set; } = 0M; + + + /// + /// Desc:还箱日期 + /// + [SugarColumn(ColumnDescription = "还箱日期", IsNullable = true, Length = 20)] + public DateTime? DropoffDate { get; set; } + + + /// + /// Desc:提箱港口 + /// + [SugarColumn(ColumnDescription = "提箱港口", IsNullable = true, Length = 20)] + public string PickupPortid { get; set; } + + + + /// + /// Desc:还箱港口 + /// + [SugarColumn(ColumnDescription = "还箱港口", IsNullable = true, Length = 20)] + public string DropoffPortid { get; set; } + + /// + /// Desc:业务编号/提单号 + /// + [SugarColumn(ColumnDescription = "业务编号/提单号", IsNullable = true, Length = 20)] + public string Mblno { get; set; } + + /// + /// Desc:船名航次 + /// + [SugarColumn(ColumnDescription = "船名航次", IsNullable = true, Length = 100)] + public string VesselVoyno { get; set; } +} + diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentOut.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentOut.cs new file mode 100644 index 00000000..63ef2431 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentOut.cs @@ -0,0 +1,79 @@ +using DS.Module.Core; +using DS.Module.Core.Data; +using SqlSugar; + +namespace DS.WMS.ContainerManagement.Info.Entity; + +/// +/// 箱管_租箱租出 +/// +[SqlSugar.SugarTable("CM_RentIn", "箱管_租箱租出")] +public class CM_RentOut : BaseOrgModel +{ + /// + /// Desc:租箱业务号 + /// + [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false, Length = 20)] + public string Billno { get; set; } + + /// + /// Desc:租箱退租 + /// + [SugarColumn(ColumnDescription = "租箱退租", IsNullable = false, Length = 20)] + public string RentDirect { get; set; } + + /// + /// Desc:租箱类型 长租短租单程 + /// + [SugarColumn(ColumnDescription = "租箱类型", IsNullable = true, Length = 20)] + public string RentType { get; set; } + + /// + /// Desc:业务状态 + /// + [SugarColumn(ColumnDescription = "业务状态", IsNullable = true, Length = 20)] + public string BillState { get; set; } + + /// + /// Desc:业务所属分部 + /// + [SugarColumn(ColumnDescription = "业务所属分部", IsNullable = true, Length = 50)] + public string Corpid { get; set; } + + /// + /// Desc:原箱主 + /// + [SugarColumn(ColumnDescription = "原箱主", IsNullable = true, Length = 50)] + public string OldContainerOwner { get; set; } + + + /// + /// Desc:业务日期 + /// + [SugarColumn(ColumnDescription = "业务日期", IsNullable = true, Length = 20)] + public DateTime? Bsdate { get; set; } + + /// + /// Desc:会计期间 + /// + [SugarColumn(ColumnDescription = "会计期间", IsNullable = true, Length = 7)] + public string Accdate { get; set; } + + /// + /// Desc:是否业务锁定 + /// + [SugarColumn(ColumnDescription = "是否业务锁定", DefaultValue = "0")] + public bool? IsBusinessLocking { get; set; } = false; + /// + /// Desc:是否费用锁定 + /// + [SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")] + public bool? IsFeeLocking { get; set; } = false; + + /// + /// Desc:备注 + /// + [SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 500)] + public string Remark { get; set; } +} + diff --git a/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs b/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs index 7439fe5d..de5972c6 100644 --- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs +++ b/ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_ChangeService.cs @@ -88,7 +88,7 @@ public class CM_State_ChangeService : CMServiceBase, ICM_State_ChangeService var entity = TenantDb.Insertable(data).ExecuteReturnEntity(); - UpdateCM_CurrentStateAsync(data); + UpdateCM_CurrentStateAsync(req); return DataResult.Successed("添加成功!", entity.Id, MultiLanguageConst.DataCreateSuccess); }