修改预订舱的实体类

ds-wms-service/DS.WMS.Core/Op/Entity/SpaceBooking/SpaceBookingOrder.cs

@@ -1,4 +1,5 @@
-using System;
+using DS.Module.Core.Data;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,8 +10,8 @@ namespace DS.WMS.Core.Op.Entity
     /// <summary>
     /// 预订舱记录表
     /// </summary>
-    [SqlSugar.SugarTable("space_booking_order", "预订舱记录表")]
-    public class SpaceBookingOrder
+    [SqlSugar.SugarTable("op_sea_space_booking_order", "预订舱记录表")]
+    public class SpaceBookingOrder : BaseModelV2<long>
     {
         /// <summary>
         /// 订舱id
@@ -587,7 +588,7 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 船期金额
         /// </summary>
-        [SqlSugar.SugarColumn(ColumnDescription = "船期金额", IsNullable = true)]
+        [SqlSugar.SugarColumn(ColumnDescription = "船期金额", Length = 19, DecimalDigits = 2, IsNullable = true)]
         public Nullable<decimal> ShipRateTotalAmount { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Entity/SpaceBooking/SpaceBookingOrderCtn.cs

@@ -1,4 +1,5 @@
-using System;
+using DS.Module.Core.Data;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,7 +7,58 @@ using System.Threading.Tasks;
 
 namespace DS.WMS.Core.Op.Entity
 {
-    public class SpaceBookingOrderCtn
+    /// <summary>
+    /// 预订舱记录表箱信息
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_space_booking_order_ctn", "预订舱记录表箱信息")]
+    public class SpaceBookingOrderCtn : BaseModelV2<long>
     {
+        /// <summary>
+        /// 主记录ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "主记录ID", IsNullable = true)]
+        public long RecordId { get; set; }
+
+        /// <summary>
+        /// 集装箱箱型
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "集装箱箱型", Length = 20, IsNullable = true)]
+        public string CtnCode { get; set; }
+
+        /// <summary>
+        /// 对应船公司箱型
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "对应船公司箱型", Length = 20, IsNullable = true)]
+        public string CarrierCtnCode { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱量", IsNullable = true)]
+        public Nullable<int> CtnNum { get; set; }
+
+        /// <summary>
+        /// 集装箱箱型名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "集装箱箱型名称", Length = 20, IsNullable = true)]
+        public string CtnName { get; set; }
+
+        /// <summary>
+        /// 箱内货物重量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱内货物重量", IsNullable = true)]
+        public Nullable<int> CtnSufferWeight { get; set; }
+
+        /// <summary>
+        /// 箱计量单位
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱计量单位", Length = 20, IsNullable = true)]
+        public string StuffingMeasurementType { get; set; }
+
+        /// <summary>
+        /// 重量或者体积的计量单位
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "重量或者体积的计量单位", Length = 20, IsNullable = true)]
+        public string StuffingMeasurementUnit { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/SpaceBooking/SpaceBookingOrderShipSchedule.cs

@@ -1,4 +1,5 @@
-using System;
+using DS.Module.Core.Data;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,8 +7,52 @@ using System.Threading.Tasks;
 
 namespace DS.WMS.Core.Op.Entity
 {
-    public class SpaceBookingOrderShipSchedule
+    /// <summary>
+    /// 预订舱记录表船期表信息
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_space_booking_order_shipschedule", "预订舱记录表船期表信息")]
+    public class SpaceBookingOrderShipSchedule : BaseModelV2<long>
     {
+        /// <summary>
+        /// 主记录ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "主记录ID", IsNullable = true)]
+        public long RecordId { get; set; }
 
+        /// <summary>
+        /// 船期金额
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船期金额", Length = 19, DecimalDigits = 2, IsNullable = true)]
+        public Nullable<decimal> ShipRateTotalAmount { get; set; }
+
+        /// <summary>
+        /// 船期币别
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船期币别", Length = 10, IsNullable = true)]
+        public string ShipRateTotalCurrency { get; set; }
+
+        /// <summary>
+        /// 船期PID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船期PID", IsNullable = true)]
+        public Nullable<long> ShipRatePid { get; set; }
+
+        /// <summary>
+        /// 船期MD5
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船期MD5", Length = 64, IsNullable = true)]
+        public string ShipRateMD5 { get; set; }
+
+        /// <summary>
+        /// 价格ID（SPOT专用）对应单个船期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "价格ID（SPOT专用）对应单个船期", Length = 50, IsNullable = true)]
+        public string PriceId { get; set; }
+
+        /// <summary>
+        /// 船期JSON
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDataType = "text", ColumnDescription = "船期JSON", IsNullable = true)]
+        public string ShipJson { get; set; }
     }
 }

ds-wms-service/DS.WMS.Test/SaasTest.cs

@@ -169,4 +169,20 @@ public class SaasTest
         /// </summary>
         public string Address { get; set; }
     }
+
+    /// <summary>
+    /// 初始化单表
+    /// </summary>
+    [Fact]
+    public void InitTableTestJHQ()
+    {
+        var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
+        StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 
+        tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder));
+        tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn));
+        tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule));
+        //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail));
+        //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn));
+        Assert.True(true);
+    }
 }