新增舱位管理实体类

ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocation.cs

@@ -1,12 +1,359 @@
-using System;
+using DS.Module.Core.Data;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Entity.BookingSlot
+namespace DS.WMS.Core.Op.Entity
 {
-    internal class BookingSlotAllocation
+    /// <summary>
+    /// 舱位分配表
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_booking_slot_allocation", "舱位分配表")]
+    public class BookingSlotAllocation : BaseModelV2<long>
     {
+        /// <summary>
+        /// 舱位主键
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "舱位主键", IsNullable = false)]
+        public long BookingSlotId { get; set; }
+
+        /// <summary>
+        /// 订舱主键,关联订舱主表ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱主键", IsNullable = false)]
+        public long BookingId { get; set; }
+
+        /// <summary>
+        /// 舱位提单号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "舱位提单号", Length = 64, IsNullable = false)]
+        public string SlotBookingNo { get; set; }
+
+        /// <summary>
+        /// 订舱编号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱编号", Length = 64, IsNullable = false)]
+        public string SlotNo { get; set; }
+
+        /// <summary>
+        /// 分配提单号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "分配提单号", Length = 64, IsNullable = false)]
+        public string AlloBillNo { get; set; }
+
+        /// <summary>
+        /// 最终提单号,分票后船公司重新分配提单号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "最终提单号", Length = 64, IsNullable = false)]
+        public string FinalBillNo { get; set; }
+
+        /// <summary>
+        /// 合约号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "合约号", Length = 64, IsNullable = false)]
+        public string ContractNo { get; set; }
+
+        /// <summary>
+        /// 订舱抬头
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱抬头", Length = 120, IsNullable = true)]
+        public string BookingParty { get; set; }
+
+        /// <summary>
+        /// 船名
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船名", Length = 30, IsNullable = true)]
+        public string Vessel { get; set; }
+
+        /// <summary>
+        /// 航次号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "航次号", Length = 20, IsNullable = true)]
+        public string Voyno { get; set; }
+
+        /// <summary>
+        /// 预计开船日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "预计开船日期", IsNullable = true)]
+        public Nullable<DateTime> ETD { get; set; }
+
+        /// <summary>
+        /// 预计到港日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "预计到港日期", IsNullable = true)]
+        public Nullable<DateTime> ETA { get; set; }
+
+        // <summary>
+        /// 收货地代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "收货地代码", Length = 10, IsNullable = true)]
+        public string PlaceReceiptId { get; set; }
+
+        /// <summary>
+        /// 收货地名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "收货地名称", Length = 120, IsNullable = true)]
+        public string PlaceReceipt { get; set; }
+
+        /// <summary>
+        /// 交货地代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "交货地代码", Length = 10, IsNullable = true)]
+        public string PlaceDeliveryId { get; set; }
+
+        /// <summary>
+        /// 交货地名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "交货地名称", Length = 120, IsNullable = true)]
+        public string PlaceDelivery { get; set; }
+
+        /// <summary>
+        /// 装货港代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "装货港代码", Length = 10, IsNullable = true)]
+        public string PortLoadId { get; set; }
+
+        /// <summary>
+        /// 装货港
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "装货港", Length = 120, IsNullable = true)]
+        public string PortLoad { get; set; }
+
+        /// <summary>
+        /// 卸货港代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港代码", Length = 10, IsNullable = true)]
+        public string PortDischargeId { get; set; }
+
+        /// <summary>
+        /// 卸货港
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港", Length = 120, IsNullable = true)]
+        public string PortDischarge { get; set; }
+
+        /// <summary>
+        /// 中转港1
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "中转港1", Length = 120, IsNullable = true)]
+        public string TransferPort1 { get; set; }
+
+        /// <summary>
+        /// 中转港2
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "中转港2", Length = 120, IsNullable = true)]
+        public string TransferPort2 { get; set; }
+
+        /// <summary>
+        /// 船公司ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司ID", IsNullable = true)]
+        public Nullable<long> CarrierId { get; set; }
+
+        /// <summary>
+        /// 船公司代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司代码", Length = 20, IsNullable = true)]
+        public string CarrierCode { get; set; }
+
+        /// <summary>
+        /// 船公司
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司", Length = 20, IsNullable = true)]
+        public string Carrier { get; set; }
+
+        /// <summary>
+        /// 航线代码（船公司）
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "航线代码（船公司）", Length = 40, IsNullable = true)]
+        public string LaneCode { get; set; }
+
+        /// <summary>
+        /// 航线名称（船公司）
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "航线名称（船公司）", Length = 100, IsNullable = true)]
+        public string LaneName { get; set; }
+
+        /// <summary>
+        /// 承运方式 DIRECT_SHIP-直达；TRANSFER_SHIP-中转
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "承运方式 DIRECT_SHIP-直达；TRANSFER_SHIP-中转", Length = 20, IsNullable = true)]
+        public string CarriageType { get; set; }
+
+        /// <summary>
+        /// 承运方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "承运方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 40, IsNullable = true)]
+        public string CarriageTypeName { get; set; }
+
+        /// <summary>
+        /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 20, IsNullable = true)]
+        public string BookingSlotType { get; set; }
+
+        /// <summary>
+        /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 40, IsNullable = true)]
+        public string BookingSlotTypeName { get; set; }
+
+        /// <summary>
+        /// 签单方式 ORIGINAL-正本；TELEX-电放；SEAWAY BILL-海运单；
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "签单方式 ORIGINAL-正本；TELEX-电放；SEAWAY BILL-海运单；", Length = 20, IsNullable = true)]
+        public string IssueType { get; set; }
+
+        /// <summary>
+        /// 箱型箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型箱量", Length = 20, IsNullable = true)]
+        public string CtnStat { get; set; }
+
+        /// <summary>
+        /// 所在周数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "所在周数", IsNullable = true)]
+        public Nullable<int> WeekAt { get; set; }
+
+        /// <summary>
+        /// 箱使天数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱使天数", IsNullable = true)]
+        public Nullable<int> DetensionFreeDays { get; set; }
+
+        /// <summary>
+        /// 样单截止日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "样单截止日期", IsNullable = true)]
+        public Nullable<DateTime> SICutDate { get; set; }
+
+        /// <summary>
+        /// 截港时间
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "样单截止日期", IsNullable = true)]
+        public Nullable<DateTime> CYCutDate { get; set; }
+
+        /// <summary>
+        /// VGM截止日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "VGM截止日期", IsNullable = true)]
+        public Nullable<DateTime> VGMSubmissionCutDate { get; set; }
+
+        /// <summary>
+        /// MDGF提交截止时间
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "MDGF提交截止时间", IsNullable = true)]
+        public Nullable<DateTime> MDGFCutDate { get; set; }
+
+        /// <summary>
+        /// 舱单截止时间
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "舱单截止时间", IsNullable = true)]
+        public Nullable<DateTime> ManifestCutDate { get; set; }
+
+        /// <summary>
+        /// 客户ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "客户ID", IsNullable = true)]
+        public Nullable<long> CustomerId { get; set; }
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "客户名称", Length = 20, IsNullable = true)]
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// 客服ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "客服ID", Length = 40, IsNullable = true)]
+        public string CustServiceId { get; set; }
+
+        /// <summary>
+        /// 客服名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "客服名称", Length = 40, IsNullable = true)]
+        public string CustService { get; set; }
+
+        /// <summary>
+        /// 销售ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "销售ID", Length = 40, IsNullable = true)]
+        public string SaleId { get; set; }
+
+        /// <summary>
+        /// 销售名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "销售名称", Length = 40, IsNullable = true)]
+        public string Sale { get; set; }
+
+        /// <summary>
+        /// 操作id
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "操作ID", Length = 40, IsNullable = true)]
+        public string OpId { get; set; }
+
+        /// <summary>
+        /// 操作
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "操作", Length = 40, IsNullable = true)]
+        public string Op { get; set; }
+
+        /// <summary>
+        /// 单证id
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "单证ID", Length = 40, IsNullable = true)]
+        public string DocId { get; set; }
+
+        /// <summary>
+        /// 单证
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "单证", Length = 40, IsNullable = true)]
+        public string Doc { get; set; }
+
+        /// <summary>
+        /// 商务ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "商务ID", Length = 40, IsNullable = true)]
+        public string BusinessId { get; set; }
+
+        /// <summary>
+        /// 商务
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "商务", Length = 40, IsNullable = true)]
+        public string Business { get; set; }
+
+        /// <summary>
+        /// 销售日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "销售日期", IsNullable = true)]
+        public Nullable<DateTime> SaleTime { get; set; }
+
+        /// <summary>
+        /// 发货人
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "发货人", Length = 100, IsNullable = true)]
+        public string Shipper { get; set; }
+
+        /// <summary>
+        /// 品名
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "品名", Length = 60, IsNullable = true)]
+        public string GoodsName { get; set; }
+
+        /// <summary>
+        /// 卖价
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "品名", Length = 19, DecimalDigits = 2, IsNullable = true)]
+        public Nullable<decimal> SellingPrice { get; set; }
+
+        /// <summary>
+        /// 拆票或合票标记 1-拆票 2-合票
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "拆票或合票标记 1-拆票 2-合票", IsNullable = true,DefaultValue = "0")]
+        public Nullable<int> SplitOrMergeFlag { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocationCtn.cs

@@ -1,12 +1,107 @@
-using System;
+using DS.Module.Core.Data;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Entity.BookingSlot
+namespace DS.WMS.Core.Op.Entity
 {
-    internal class BookingSlotAllocationCtn
+    /// <summary>
+    /// 舱位分配集装箱表
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_booking_slot_allocation_ctn", "舱位分配集装箱表")]
+    public class BookingSlotAllocationCtn : BaseModelV2<long>
     {
+        /// <summary>
+        /// 舱位分配主键
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "舱位分配主键", IsNullable = false)]
+        public long SlotAllocId { get; set; }
+
+        /// <summary>
+        /// 箱型代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型代码", Length = 10, IsNullable = true)]
+        public string CtnCode { get; set; }
+
+        /// <summary>
+        /// 箱型名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型名称", Length = 20, IsNullable = true)]
+        public string CtnAll { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱量", IsNullable = true, DefaultValue = "0")]
+        public int CtnNum { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱号", Length = 30, IsNullable = true)]
+        public string CNTRNo { get; set; }
+
+        /// <summary>
+        /// 箱封号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱封号", Length = 20, IsNullable = true)]
+        public string SealNo { get; set; }
+
+        /// <summary>
+        /// 件数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "件数", IsNullable = true)]
+        public Nullable<int> PKGS { get; set; }
+
+        /// <summary>
+        /// 包装
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "件数", Length = 20, IsNullable = true)]
+        public string KindPKGs { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "毛重", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> KGS { get; set; }
+
+        /// <summary>
+        /// 尺码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "尺码", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> CBM { get; set; }
+
+        /// <summary>
+        /// 皮重
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "皮重", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> TareWeight { get; set; }
+
+        /// <summary>
+        /// 箱状态
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱状态", Length = 10, IsNullable = true)]
+        public string CtnStatus { get; set; }
+
+        /// <summary>
+        /// 称重方式
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "称重方式", Length = 30, IsNullable = true)]
+        public string WeighType { get; set; }
+
+        /// <summary>
+        /// 称重重量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "称重重量", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> WeighKGS { get; set; }
+
+        /// <summary>
+        /// 称重联系人
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "称重联系人", Length = 30, IsNullable = true)]
+        public string WeighAttn { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs

@@ -313,7 +313,7 @@ namespace DS.WMS.Core.Op.Entity
         /// Cancellation时间
         /// </summary>
         [SqlSugar.SugarColumn(ColumnDescription = "Cancellation时间", IsNullable = true)]
-        public Nullable<DateTime> CANCELLATION_DATE { get; set; }
+        public Nullable<DateTime> CancellationDate { get; set; }
 
 
         /// <summary>
@@ -355,19 +355,19 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 拆票或合票标记 1-拆票 2-合票
         /// </summary>
-        [Description("拆票或合票标记")]
-        public Nullable<int> SPLIT_OR_MERGE_FLAG { get; set; }
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司航次", IsNullable = true)]
+        public Nullable<int> SplitOrMergeFlag { get; set; }
 
         /// <summary>
         /// 舱保类型 FULL-全舱保；PART-部分舱保
         /// </summary>
-        [Description("舱保类型")]
-        public string LOAD_GUARANTEE_FLAG { get; set; }
+        [SqlSugar.SugarColumn(ColumnDescription = "舱保类型 FULL-全舱保；PART-部分舱保", Length = 20, IsNullable = true)]
+        public string LoadGuaranteeFlag { get; set; }
 
         // <summary>
         /// 舱保类型名称 FULL-全舱保；PART-部分舱保
         /// </summary>
-        [Description("舱保类型名称")]
-        public string LOAD_GUARANTEE_FLAG_NAME { get; set; }
+        [SqlSugar.SugarColumn(ColumnDescription = "舱保类型名称 FULL-全舱保；PART-部分舱保", Length = 50, IsNullable = true)]
+        public string LoadGuaranteeFlagName { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotCtn.cs

@@ -1,12 +1,107 @@
-using System;
+using DS.Module.Core.Data;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Entity.BookingSlot
+namespace DS.WMS.Core.Op.Entity
 {
-    internal class BookingSlotCtn
+    /// <summary>
+    /// 舱位集装箱管理
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_booking_slot_ctn", "舱位集装箱管理")]
+    public class BookingSlotCtn : BaseModelV2<long>
     {
+        /// <summary>
+        /// 舱位主键
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "舱位主键", IsNullable = false)]
+        public long SlotId { get; set; }
+
+        /// <summary>
+        /// 箱型代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型代码", Length = 10, IsNullable = true)]
+        public string CtnCode { get; set; }
+
+        /// <summary>
+        /// 箱型名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型名称", Length = 20, IsNullable = true)]
+        public string CtnAll { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱量", IsNullable = true, DefaultValue = "0")]
+        public int CtnNum { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱号", Length = 30, IsNullable = true)]
+        public string CNTRNo { get; set; }
+
+        /// <summary>
+        /// 箱封号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱封号", Length = 20, IsNullable = true)]
+        public string SealNo { get; set; }
+
+        /// <summary>
+        /// 件数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "件数", IsNullable = true)]
+        public Nullable<int> PKGS { get; set; }
+
+        /// <summary>
+        /// 包装
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "件数", Length = 20, IsNullable = true)]
+        public string KindPKGs { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "毛重", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> KGS { get; set; }
+
+        /// <summary>
+        /// 尺码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "尺码", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> CBM { get; set; }
+
+        /// <summary>
+        /// 皮重
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "皮重", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> TareWeight { get; set; }
+
+        /// <summary>
+        /// 箱状态
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱状态", Length = 10, IsNullable = true)]
+        public string CtnStatus { get; set; }
+
+        /// <summary>
+        /// 称重方式
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "称重方式", Length = 30, IsNullable = true)]
+        public string WeighType { get; set; }
+
+        /// <summary>
+        /// 称重重量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "称重重量", Length = 18, DecimalDigits = 4, IsNullable = true)]
+        public Nullable<decimal> WeighKGS { get; set; }
+
+        /// <summary>
+        /// 称重联系人
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "称重联系人", Length = 30, IsNullable = true)]
+        public string WeighAttn { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemand.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,82 @@ using System.Threading.Tasks;
 
 namespace DS.WMS.Core.Op.Entity.BookingSlot
 {
-    internal class BookingSlotDemand
+    /// <summary>
+    /// 舱位分配表
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_booking_slot_allocation", "舱位分配表")]
+    public class BookingSlotDemand : BaseModelV2<long>
     {
+        /// <summary>
+        /// 客户ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "客户ID", IsNullable = true)]
+        public Nullable<long> CustomerId { get; set; }
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "客户名称", Length = 20, IsNullable = true)]
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// 装货港代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "装货港代码", Length = 10, IsNullable = true)]
+        public string PortLoadId { get; set; }
+
+        /// <summary>
+        /// 装货港
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "装货港", Length = 120, IsNullable = true)]
+        public string PortLoad { get; set; }
+
+        /// <summary>
+        /// 卸货港代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港代码", Length = 10, IsNullable = true)]
+        public string PortDischargeId { get; set; }
+
+        /// <summary>
+        /// 卸货港
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港", Length = 120, IsNullable = true)]
+        public string PortDischarge { get; set; }
+
+        /// <summary>
+        /// 船公司ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司ID", IsNullable = true)]
+        public Nullable<long> CarrierId { get; set; }
+
+        /// <summary>
+        /// 船公司代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司代码", Length = 20, IsNullable = true)]
+        public string CarrierCode { get; set; }
+
+        /// <summary>
+        /// 船公司
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司", Length = 20, IsNullable = true)]
+        public string Carrier { get; set; }
+
+        /// <summary>
+        /// 预计开船日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "预计开船日期", IsNullable = true)]
+        public Nullable<DateTime> ETD { get; set; }
+
+        /// <summary>
+        /// 预计到港日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "预计到港日期", IsNullable = true)]
+        public Nullable<DateTime> ETA { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "备注", Length = 200, IsNullable = true)]
+        public string Remark { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemandCtn.cs

@@ -1,12 +1,40 @@
-using System;
+using DS.Module.Core.Data;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Entity.BookingSlot
+namespace DS.WMS.Core.Op.Entity
 {
-    internal class BookingSlotDemandCtn
+    /// <summary>
+    /// 舱位需求预报记录箱信息
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_booking_slot_demand_ctn", "舱位需求预报记录箱信息")]
+    public class BookingSlotDemandCtn : BaseModelV2<long>
     {
+        /// <summary>
+        /// 舱位需求预报记录ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "舱位需求预报记录ID", IsNullable = false)]
+        public long DemandId { get; set; }
+
+        /// <summary>
+        /// 箱型代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型代码", Length = 10, IsNullable = true)]
+        public string CtnCode { get; set; }
+
+        /// <summary>
+        /// 箱型名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型名称", Length = 20, IsNullable = true)]
+        public string CtnAll { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱量", IsNullable = true, DefaultValue = "0")]
+        public int CtnNum { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotStock.cs

@@ -1,12 +1,204 @@
-using System;
+using DS.Module.Core.Data;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Entity.BookingSlot
+namespace DS.WMS.Core.Op.Entity
 {
-    internal class BookingSlotStock
+    /// <summary>
+    /// 舱位库存表
+    /// </summary>
+    [SqlSugar.SugarTable("op_sea_booking_slot_stock", "舱位库存表")]
+    public class BookingSlotStock : BaseModelV2<long>
     {
+        /// <summary>
+        /// 船名
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "舱位主键", Length = 10, IsNullable = true)]
+        public string Vessel { get; set; }
+
+        /// <summary>
+        /// 航次号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "航次号", Length = 20, IsNullable = true)]
+        public string Voyno { get; set; }
+
+        /// <summary>
+        /// 合约号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "合约号", Length = 64, IsNullable = true)]
+        public string ContractNo { get; set; }
+
+        /// <summary>
+        /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 20, IsNullable = true)]
+        public string BookingSlotType { get; set; }
+
+        /// <summary>
+        /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 40, IsNullable = true)]
+        public string BookingSlotTypeName { get; set; }
+
+        /// <summary>
+        /// 订舱抬头
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "订舱抬头", Length = 120, IsNullable = true)]
+        public string BookingParty { get; set; }
+
+        /// <summary>
+        /// 船公司主键
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司主键", IsNullable = true)]
+        public long CarrierId { get; set; }
+
+        /// <summary>
+        /// 船公司代号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司代号", Length = 20, IsNullable = true)]
+        public string CarrierCode { get; set; }
+
+        /// <summary>
+        /// 船公司
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "船公司代号", Length = 50, IsNullable = true)]
+        public string Carrier { get; set; }
+
+        /// <summary>
+        /// 预计开船日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "预计开船日期", IsNullable = true)]
+        public Nullable<DateTime> ETD { get; set; }
+
+        /// <summary>
+        /// 预计到港日期
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "预计到港日期", IsNullable = true)]
+        public Nullable<DateTime> ETA { get; set; }
+
+        /// <summary>
+        /// 收货地
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "收货地", Length = 120, IsNullable = true)]
+        public string PlaceReceipt { get; set; }
+
+        /// <summary>
+        /// 交货地
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "交货地", Length = 120, IsNullable = true)]
+        public string PlaceDelivery { get; set; }
+
+        /// <summary>
+        /// 装货港代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "装货港代码", Length = 10, IsNullable = true)]
+        public string PortLoadId { get; set; }
+
+        /// <summary>
+        /// 装货港
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "装货港", Length = 120, IsNullable = true)]
+        public string PortLoad { get; set; }
+
+        /// <summary>
+        /// 卸货港代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港代码", Length = 10, IsNullable = true)]
+        public string PortDischargeId { get; set; }
+
+        /// <summary>
+        /// 卸货港
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港", Length = 120, IsNullable = true)]
+        public string PortDischarge { get; set; }
+
+        /// <summary>
+        /// 卸货港国家代码
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港国家代码", Length = 10, IsNullable = true)]
+        public string PortDischargeCountryCode { get; set; }
+
+        /// <summary>
+        /// 卸货港国家名称
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "卸货港国家代码", Length = 120, IsNullable = true)]
+        public string PortDischargeCountry { get; set; }
+
+        /// <summary>
+        /// 航线代码（船公司）
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "航线代码（船公司）", Length = 20, IsNullable = true)]
+        public string LaneCode { get; set; }
+
+        /// <summary>
+        /// 航线名称（船公司）
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "航线名称（船公司）", Length = 50, IsNullable = true)]
+        public string LaneName { get; set; }
+
+        /// <summary>
+        /// 所在周数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "航线名称（船公司）", IsNullable = true)]
+        public Nullable<int> WeekAt { get; set; }
+
+        /// <summary>
+        /// 箱型箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "箱型箱量", Length = 200, IsNullable = true)]
+        public string CtnStat { get; set; }
+
+        /// <summary>
+        /// 使用箱型箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "使用箱型箱量", Length = 200, IsNullable = true)]
+        public string UseCtnStat { get; set; }
+
+        /// <summary>
+        /// 剩余箱型箱量
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "剩余箱型箱量", Length = 200, IsNullable = true)]
+        public string RemainCtnStat { get; set; }
+
+        /// <summary>
+        /// 总舱位数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "总舱位数", IsNullable = true,DefaultValue = "0")]
+        public int TotalOrders { get; set; }
+
+        /// <summary>
+        /// 使用舱位数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "使用舱位数", IsNullable = true, DefaultValue = "0")]
+        public int UseNum { get; set; }
+
+        /// <summary>
+        /// 取消舱位数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "取消舱位数", IsNullable = true, DefaultValue = "0")]
+        public int CancelNum { get; set; }
+
+        /// <summary>
+        /// 总箱数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "总箱数", IsNullable = true, DefaultValue = "0")]
+        public int TotalCtns { get; set; }
+
+        /// <summary>
+        /// 使用箱数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "使用箱数", IsNullable = true, DefaultValue = "0")]
+        public int UseCtnsNum { get; set; }
+
+        /// <summary>
+        /// 剩余箱数
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "剩余箱数", IsNullable = true, DefaultValue = "0")]
+        public int RemainCtnsNum { get; set; }
     }
 }

ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt

@@ -327,3 +327,10 @@
 2024-07-15 11:24:31.8141 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
 2024-07-15 11:24:31.8141 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
 2024-07-15 11:24:31.8243 Info Configuration initialized.
+2024-07-15 11:55:56.3072 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-15 11:55:56.3072 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-15 11:55:56.3072 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-15 11:55:56.3287 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-15 11:55:56.3287 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config
+2024-07-15 11:55:56.3370 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-15 11:55:56.3370 Info Configuration initialized.

ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi</_PublishTargetUrl>
-    <History>True|2024-07-15T02:20:03.3925876Z||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
+    <History>True|2024-07-15T05:43:42.6073130Z||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.OpApi/appsettings.json

@@ -90,5 +90,8 @@
         "UserKey": "wu",
         "UserSecret": "123456",
         "Environment": "TEST"
+    },
+    "RedisInfo": {
+       "RedisConfig": "127.0.0.1:6379,password=,defaultDatabase=15"
     }
 }