20240801_2

4 months ago · 88c4c276c1
parent e66cc01f4b
commit 88c4c276c1
6 changed files with 395 additions and 9 deletions
--- 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
@ -0,0 +1,127 @@
+using DS.Module.Core;
+using DS.WMS.Core.Op.Entity;
+using FluentValidation;
+using SqlSugar;
+
+namespace DS.WMS.ContainerManagement.Info.Dtos;
+
+/// <summary>
+/// 箱管_租箱租入 请求实体
+/// </summary>
+public class CM_RentIn_DetailReq
+{
+    /// <summary>
+    /// 主键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; }
+
+    /// <summary>
+    /// Desc:箱型
+    /// </summary>
+    public string Ctnall { get; set; }
+
+
+    /// <summary>
+    /// Desc:原箱主
+    /// </summary>
+    public string OldContainerOwner { get; set; }
+
+
+
+    /// <summary>
+    /// Desc:租箱业务 租入0/租入退租1
+    /// </summary>
+    public string CMRentDirectEnum { get; set; }
+
+    /// <summary>
+    /// Desc:租箱类型 长租1 短租0 单程2
+    /// </summary>
+    public string RentType { get; set; }
+
+    /// <summary>
+    /// Desc:业务状态
+    /// </summary>
+    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 string FeeStartDate { get; set; }
+
+    /// <summary>
+    /// Desc:币别
+    /// </summary>
+    public string Currenty { get; set; } = "USD";
+
+
+    /// <summary>
+    /// Desc:日租金
+    /// </summary>
+    public decimal? Dailyrate { get; set; } = 0M;
+
+
+    /// <summary>
+    /// Desc:提箱费
+    /// </summary>
+    public decimal? PickupFee { get; set; } = 0M;
+
+    /// <summary>
+    /// Desc:还箱费
+    /// </summary>
+    public decimal? DropoffFee { get; set; } = 0M;
+
+
+    /// <summary>
+    /// Desc:还箱日期
+    /// </summary>
+    public DateTime? DropoffDate { get; set; }
+
+
+    /// <summary>
+    /// Desc:提箱港口
+    /// </summary>
+    public string PickupPortid { get; set; }
+
+
+
+    /// <summary>
+    /// Desc:还箱港口
+    /// </summary>
+    public string DropoffPortid { get; set; }
+
+    /// <summary>
+    /// Desc:业务编号/提单号
+    /// </summary>
+    public string Mblno { get; set; }
+
+    /// <summary>
+    /// Desc:船名航次
+    /// </summary>
+    public string VesselVoyno { get; set; }
+}
--- 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
@ -0,0 +1,41 @@
+using DS.Module.Core;
+using DS.WMS.Core.Op.Entity;
+using SqlSugar;
+
+namespace DS.WMS.ContainerManagement.Info.Dtos;
+
+/// <summary>
+/// 箱管_租箱租入 返回实体
+/// </summary>
+public class CM_RentIn_DetailRes
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// Desc:集装箱号
+    /// </summary>
+    public string Cntrno { get; set; }
+
+    public BusinessType BusinessType { get; set; } = BusinessType.CM_RentIn;
+    /// <summary>
+    /// Desc:箱型
+    /// </summary>
+    public string Ctnall { get; set; }
+
+    /// <summary>
+    /// Desc:箱皮重
+    /// </summary>
+    public decimal? CtnWeight { get; set; }
+
+    /// <summary>
+    /// Desc:箱生产时间
+    /// </summary>
+    public DateTime? ProductionDate { get; set; }
+
+    /// <summary>
+    /// Desc:箱初期成本
+    /// </summary>
+    public decimal? CtnValue_Base { get; set; }
+}
--- 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<long>
    /// Desc:租箱业务号
    /// </summary>
    [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false, Length = 20)]
-    public string Custno { get; set; }
+    public string Billno { get; set; }

    /// <summary>
    /// Desc:租箱退租
@ -34,11 +34,6 @@ public class CM_RentIn : BaseOrgModel<long>
    [SugarColumn(ColumnDescription = "业务状态", IsNullable = true, Length = 20)]
    public string BillState { get; set; }

-    /// <summary>
-    /// Desc:业务所属分部
-    /// </summary>
-    [SugarColumn(ColumnDescription = "业务所属分部", IsNullable = true, Length = 50)]
-    public string Corpid { get; set; }

    /// <summary>
    /// Desc:原箱主
@ -62,12 +57,12 @@ public class CM_RentIn : BaseOrgModel<long>
    /// <summary>
    /// Desc:是否业务锁定
    /// </summary>
-    [SugarColumn(ColumnDescription = "是否业务锁定", DefaultValue = "0")]
+    [SugarColumn(ColumnDescription = "是否业务锁定", IsNullable = false, DefaultValue = "0")]
    public bool? IsBusinessLocking { get; set; } = false;
    /// <summary>
    /// Desc:是否费用锁定
    /// </summary>
-    [SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")]
+    [SugarColumn(ColumnDescription = "是否费用锁定", IsNullable = false, DefaultValue = "0")]
    public bool? IsFeeLocking { get; set; } = false;

    /// <summary>
--- 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
@ -0,0 +1,144 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using SqlSugar;
+
+namespace DS.WMS.ContainerManagement.Info.Entity;
+
+/// <summary>
+/// 箱管_租箱租入明细
+/// </summary>
+[SqlSugar.SugarTable("CM_RentIn_Detail", "箱管_租箱租入明细")]
+public class CM_RentIn_Detail : BaseOrgModel<long>
+{
+    /// <summary>
+    /// 租箱业务id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false)]
+    public long Pid { get; set; }
+
+    /// <summary>
+    /// Desc:租箱业务号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false, Length = 20)]
+    public string Billno { get; set; }
+
+    /// <summary>
+    /// Desc:箱号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "箱号", IsNullable = false, Length = 20)]
+    public string Cntrno { get; set; }
+
+    /// <summary>
+    /// Desc:箱型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "箱型", IsNullable = false, Length = 20)]
+    public string Ctnall { get; set; }
+
+
+    /// <summary>
+    /// Desc:原箱主
+    /// </summary>
+    [SugarColumn(ColumnDescription = "原箱主", IsNullable = true, Length = 50)]
+    public string OldContainerOwner { get; set; }
+
+    
+
+    /// <summary>
+    /// Desc:租箱业务 租入0/租入退租1
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租箱类型", IsNullable = true, Length = 20)]
+    public string CMRentDirectEnum { get; set; }
+
+    /// <summary>
+    /// Desc:租箱类型 长租1 短租0 单程2
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租箱类型", IsNullable = true, Length = 20)]
+    public string RentType { get; set; }
+
+    /// <summary>
+    /// Desc:业务状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "业务状态", IsNullable = true, Length = 20)]
+    public string BillState { get; set; }
+
+
+    /// <summary>
+    /// Desc:关联放箱单号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "关联放箱单号", IsNullable = true, Length = 50)]
+    public string CtnReleaseNo { get; set; }
+
+
+    /// <summary>
+    /// Desc:租入日期 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "业务日期", IsNullable = true, Length = 20)]
+    public DateTime? Bsdate { get; set; }
+
+    /// <summary>
+    /// Desc:开始计费日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "开始计费日期", IsNullable = true, Length = 7)]
+    public string FeeStartDate { get; set; }
+
+    /// <summary>
+    /// Desc:币别
+    /// </summary>
+    [SugarColumn(ColumnDescription = "币别", IsNullable = true, Length = 7)]
+    public string Currenty { get; set; } = "USD";
+
+
+    /// <summary>
+    /// Desc:日租金
+    /// </summary>
+    [SugarColumn(ColumnDescription = "日租金", IsNullable = true, Length = 20)]
+    public decimal? Dailyrate { get; set; } = 0M;
+
+
+    /// <summary>
+    /// Desc:提箱费
+    /// </summary>
+    [SugarColumn(ColumnDescription = "提箱费", IsNullable = true, Length = 20)]
+    public decimal? PickupFee { get; set; } = 0M;
+
+    /// <summary>
+    /// Desc:还箱费
+    /// </summary>
+    [SugarColumn(ColumnDescription = "还箱费", IsNullable = true, Length = 20)]
+    public decimal? DropoffFee { get; set; } = 0M;
+
+
+    /// <summary>
+    /// Desc:还箱日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "还箱日期", IsNullable = true, Length = 20)]
+    public DateTime? DropoffDate { get; set; }
+
+
+    /// <summary>
+    /// Desc:提箱港口
+    /// </summary>
+    [SugarColumn(ColumnDescription = "提箱港口", IsNullable = true, Length = 20)]
+    public string PickupPortid { get; set; }
+
+
+
+    /// <summary>
+    /// Desc:还箱港口
+    /// </summary>
+    [SugarColumn(ColumnDescription = "还箱港口", IsNullable = true, Length = 20)]
+    public string DropoffPortid { get; set; }
+
+    /// <summary>
+    /// Desc:业务编号/提单号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "业务编号/提单号", IsNullable = true, Length = 20)]
+    public string Mblno { get; set; }
+
+    /// <summary>
+    /// Desc:船名航次
+    /// </summary>
+    [SugarColumn(ColumnDescription = "船名航次", IsNullable = true, Length = 100)]
+    public string VesselVoyno { get; set; }
+}
+
--- a/ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_RentOut.cs
+++ 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;
+
+/// <summary>
+/// 箱管_租箱租出
+/// </summary>
+[SqlSugar.SugarTable("CM_RentIn", "箱管_租箱租出")]
+public class CM_RentOut : BaseOrgModel<long>
+{
+    /// <summary>
+    /// Desc:租箱业务号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租箱业务号", IsNullable = false, Length = 20)]
+    public string Billno { get; set; }
+
+    /// <summary>
+    /// Desc:租箱退租
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租箱退租", IsNullable = false, Length = 20)]
+    public string RentDirect { get; set; }
+
+    /// <summary>
+    /// Desc:租箱类型 长租短租单程
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租箱类型", IsNullable = true, Length = 20)]
+    public string RentType { get; set; }
+
+    /// <summary>
+    /// Desc:业务状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "业务状态", IsNullable = true, Length = 20)]
+    public string BillState { get; set; }
+
+    /// <summary>
+    /// Desc:业务所属分部
+    /// </summary>
+    [SugarColumn(ColumnDescription = "业务所属分部", IsNullable = true, Length = 50)]
+    public string Corpid { get; set; }
+
+    /// <summary>
+    /// Desc:原箱主
+    /// </summary>
+    [SugarColumn(ColumnDescription = "原箱主", IsNullable = true, Length = 50)]
+    public string OldContainerOwner { get; set; }
+
+
+    /// <summary>
+    /// Desc:业务日期 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "业务日期", IsNullable = true, Length = 20)]
+    public DateTime? Bsdate { get; set; }
+
+    /// <summary>
+    /// Desc:会计期间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "会计期间", IsNullable = true, Length = 7)]
+    public string Accdate { get; set; }
+
+    /// <summary>
+    /// Desc:是否业务锁定
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否业务锁定", DefaultValue = "0")]
+    public bool? IsBusinessLocking { get; set; } = false;
+    /// <summary>
+    /// Desc:是否费用锁定
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")]
+    public bool? IsFeeLocking { get; set; } = false;
+
+    /// <summary>
+    /// Desc:备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 500)]
+    public string Remark { get; set; }
+}
+
--- 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);
        }