From f14ee935189c8ece4ac072bfc2bbbe66edea8ae7 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 15 Jul 2024 15:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=88=B1=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingSlot/BookingSlotAllocation.cs | 353 +++++++++++++++++- .../BookingSlot/BookingSlotAllocationCtn.cs | 101 ++++- .../Op/Entity/BookingSlot/BookingSlotBase.cs | 14 +- .../Op/Entity/BookingSlot/BookingSlotCtn.cs | 101 ++++- .../Entity/BookingSlot/BookingSlotDemand.cs | 80 +++- .../BookingSlot/BookingSlotDemandCtn.cs | 34 +- .../Op/Entity/BookingSlot/BookingSlotStock.cs | 198 +++++++++- .../DS.WMS.OpApi/Logs/internal-nlog.txt | 7 + .../PublishProfiles/FolderProfile.pubxml.user | 2 +- ds-wms-service/DS.WMS.OpApi/appsettings.json | 3 + 10 files changed, 868 insertions(+), 25 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocation.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocation.cs index 396dd3ea..3f60985c 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocation.cs +++ b/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 + /// + /// 舱位分配表 + /// + [SqlSugar.SugarTable("op_sea_booking_slot_allocation", "舱位分配表")] + public class BookingSlotAllocation : BaseModelV2 { + /// + /// 舱位主键 + /// + [SqlSugar.SugarColumn(ColumnDescription = "舱位主键", IsNullable = false)] + public long BookingSlotId { get; set; } + + /// + /// 订舱主键,关联订舱主表ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱主键", IsNullable = false)] + public long BookingId { get; set; } + + /// + /// 舱位提单号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "舱位提单号", Length = 64, IsNullable = false)] + public string SlotBookingNo { get; set; } + + /// + /// 订舱编号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱编号", Length = 64, IsNullable = false)] + public string SlotNo { get; set; } + + /// + /// 分配提单号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "分配提单号", Length = 64, IsNullable = false)] + public string AlloBillNo { get; set; } + + /// + /// 最终提单号,分票后船公司重新分配提单号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "最终提单号", Length = 64, IsNullable = false)] + public string FinalBillNo { get; set; } + + /// + /// 合约号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "合约号", Length = 64, IsNullable = false)] + public string ContractNo { get; set; } + + /// + /// 订舱抬头 + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱抬头", Length = 120, IsNullable = true)] + public string BookingParty { get; set; } + + /// + /// 船名 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船名", Length = 30, IsNullable = true)] + public string Vessel { get; set; } + + /// + /// 航次号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "航次号", Length = 20, IsNullable = true)] + public string Voyno { get; set; } + + /// + /// 预计开船日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "预计开船日期", IsNullable = true)] + public Nullable ETD { get; set; } + + /// + /// 预计到港日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "预计到港日期", IsNullable = true)] + public Nullable ETA { get; set; } + + // + /// 收货地代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "收货地代码", Length = 10, IsNullable = true)] + public string PlaceReceiptId { get; set; } + + /// + /// 收货地名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "收货地名称", Length = 120, IsNullable = true)] + public string PlaceReceipt { get; set; } + + /// + /// 交货地代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "交货地代码", Length = 10, IsNullable = true)] + public string PlaceDeliveryId { get; set; } + + /// + /// 交货地名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "交货地名称", Length = 120, IsNullable = true)] + public string PlaceDelivery { get; set; } + + /// + /// 装货港代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "装货港代码", Length = 10, IsNullable = true)] + public string PortLoadId { get; set; } + + /// + /// 装货港 + /// + [SqlSugar.SugarColumn(ColumnDescription = "装货港", Length = 120, IsNullable = true)] + public string PortLoad { get; set; } + + /// + /// 卸货港代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港代码", Length = 10, IsNullable = true)] + public string PortDischargeId { get; set; } + + /// + /// 卸货港 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港", Length = 120, IsNullable = true)] + public string PortDischarge { get; set; } + + /// + /// 中转港1 + /// + [SqlSugar.SugarColumn(ColumnDescription = "中转港1", Length = 120, IsNullable = true)] + public string TransferPort1 { get; set; } + + /// + /// 中转港2 + /// + [SqlSugar.SugarColumn(ColumnDescription = "中转港2", Length = 120, IsNullable = true)] + public string TransferPort2 { get; set; } + + /// + /// 船公司ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司ID", IsNullable = true)] + public Nullable CarrierId { get; set; } + + /// + /// 船公司代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司代码", Length = 20, IsNullable = true)] + public string CarrierCode { get; set; } + + /// + /// 船公司 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司", Length = 20, IsNullable = true)] + public string Carrier { get; set; } + + /// + /// 航线代码（船公司） + /// + [SqlSugar.SugarColumn(ColumnDescription = "航线代码（船公司）", Length = 40, IsNullable = true)] + public string LaneCode { get; set; } + + /// + /// 航线名称（船公司） + /// + [SqlSugar.SugarColumn(ColumnDescription = "航线名称（船公司）", Length = 100, IsNullable = true)] + public string LaneName { get; set; } + + /// + /// 承运方式 DIRECT_SHIP-直达；TRANSFER_SHIP-中转 + /// + [SqlSugar.SugarColumn(ColumnDescription = "承运方式 DIRECT_SHIP-直达；TRANSFER_SHIP-中转", Length = 20, IsNullable = true)] + public string CarriageType { get; set; } + + /// + /// 承运方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + [SqlSugar.SugarColumn(ColumnDescription = "承运方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 40, IsNullable = true)] + public string CarriageTypeName { get; set; } + + /// + /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 20, IsNullable = true)] + public string BookingSlotType { get; set; } + + /// + /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 40, IsNullable = true)] + public string BookingSlotTypeName { get; set; } + + /// + /// 签单方式 ORIGINAL-正本；TELEX-电放；SEAWAY BILL-海运单； + /// + [SqlSugar.SugarColumn(ColumnDescription = "签单方式 ORIGINAL-正本；TELEX-电放；SEAWAY BILL-海运单；", Length = 20, IsNullable = true)] + public string IssueType { get; set; } + + /// + /// 箱型箱量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型箱量", Length = 20, IsNullable = true)] + public string CtnStat { get; set; } + + /// + /// 所在周数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "所在周数", IsNullable = true)] + public Nullable WeekAt { get; set; } + + /// + /// 箱使天数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱使天数", IsNullable = true)] + public Nullable DetensionFreeDays { get; set; } + + /// + /// 样单截止日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "样单截止日期", IsNullable = true)] + public Nullable SICutDate { get; set; } + + /// + /// 截港时间 + /// + [SqlSugar.SugarColumn(ColumnDescription = "样单截止日期", IsNullable = true)] + public Nullable CYCutDate { get; set; } + + /// + /// VGM截止日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "VGM截止日期", IsNullable = true)] + public Nullable VGMSubmissionCutDate { get; set; } + + /// + /// MDGF提交截止时间 + /// + [SqlSugar.SugarColumn(ColumnDescription = "MDGF提交截止时间", IsNullable = true)] + public Nullable MDGFCutDate { get; set; } + + /// + /// 舱单截止时间 + /// + [SqlSugar.SugarColumn(ColumnDescription = "舱单截止时间", IsNullable = true)] + public Nullable ManifestCutDate { get; set; } + + /// + /// 客户ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "客户ID", IsNullable = true)] + public Nullable CustomerId { get; set; } + + /// + /// 客户名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "客户名称", Length = 20, IsNullable = true)] + public string CustomerName { get; set; } + + /// + /// 客服ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "客服ID", Length = 40, IsNullable = true)] + public string CustServiceId { get; set; } + + /// + /// 客服名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "客服名称", Length = 40, IsNullable = true)] + public string CustService { get; set; } + + /// + /// 销售ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "销售ID", Length = 40, IsNullable = true)] + public string SaleId { get; set; } + + /// + /// 销售名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "销售名称", Length = 40, IsNullable = true)] + public string Sale { get; set; } + + /// + /// 操作id + /// + [SqlSugar.SugarColumn(ColumnDescription = "操作ID", Length = 40, IsNullable = true)] + public string OpId { get; set; } + + /// + /// 操作 + /// + [SqlSugar.SugarColumn(ColumnDescription = "操作", Length = 40, IsNullable = true)] + public string Op { get; set; } + + /// + /// 单证id + /// + [SqlSugar.SugarColumn(ColumnDescription = "单证ID", Length = 40, IsNullable = true)] + public string DocId { get; set; } + + /// + /// 单证 + /// + [SqlSugar.SugarColumn(ColumnDescription = "单证", Length = 40, IsNullable = true)] + public string Doc { get; set; } + + /// + /// 商务ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "商务ID", Length = 40, IsNullable = true)] + public string BusinessId { get; set; } + + /// + /// 商务 + /// + [SqlSugar.SugarColumn(ColumnDescription = "商务", Length = 40, IsNullable = true)] + public string Business { get; set; } + + /// + /// 销售日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "销售日期", IsNullable = true)] + public Nullable SaleTime { get; set; } + + /// + /// 发货人 + /// + [SqlSugar.SugarColumn(ColumnDescription = "发货人", Length = 100, IsNullable = true)] + public string Shipper { get; set; } + + /// + /// 品名 + /// + [SqlSugar.SugarColumn(ColumnDescription = "品名", Length = 60, IsNullable = true)] + public string GoodsName { get; set; } + + /// + /// 卖价 + /// + [SqlSugar.SugarColumn(ColumnDescription = "品名", Length = 19, DecimalDigits = 2, IsNullable = true)] + public Nullable SellingPrice { get; set; } + + /// + /// 拆票或合票标记 1-拆票 2-合票 + /// + [SqlSugar.SugarColumn(ColumnDescription = "拆票或合票标记 1-拆票 2-合票", IsNullable = true,DefaultValue = "0")] + public Nullable SplitOrMergeFlag { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocationCtn.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocationCtn.cs index f5287859..39086ffd 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotAllocationCtn.cs +++ b/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 + /// + /// 舱位分配集装箱表 + /// + [SqlSugar.SugarTable("op_sea_booking_slot_allocation_ctn", "舱位分配集装箱表")] + public class BookingSlotAllocationCtn : BaseModelV2 { + /// + /// 舱位分配主键 + /// + [SqlSugar.SugarColumn(ColumnDescription = "舱位分配主键", IsNullable = false)] + public long SlotAllocId { get; set; } + + /// + /// 箱型代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型代码", Length = 10, IsNullable = true)] + public string CtnCode { get; set; } + + /// + /// 箱型名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型名称", Length = 20, IsNullable = true)] + public string CtnAll { get; set; } + + /// + /// 箱量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱量", IsNullable = true, DefaultValue = "0")] + public int CtnNum { get; set; } + + /// + /// 箱号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱号", Length = 30, IsNullable = true)] + public string CNTRNo { get; set; } + + /// + /// 箱封号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱封号", Length = 20, IsNullable = true)] + public string SealNo { get; set; } + + /// + /// 件数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "件数", IsNullable = true)] + public Nullable PKGS { get; set; } + + /// + /// 包装 + /// + [SqlSugar.SugarColumn(ColumnDescription = "件数", Length = 20, IsNullable = true)] + public string KindPKGs { get; set; } + + /// + /// 毛重 + /// + [SqlSugar.SugarColumn(ColumnDescription = "毛重", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable KGS { get; set; } + + /// + /// 尺码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "尺码", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable CBM { get; set; } + + /// + /// 皮重 + /// + [SqlSugar.SugarColumn(ColumnDescription = "皮重", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable TareWeight { get; set; } + + /// + /// 箱状态 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱状态", Length = 10, IsNullable = true)] + public string CtnStatus { get; set; } + + /// + /// 称重方式 + /// + [SqlSugar.SugarColumn(ColumnDescription = "称重方式", Length = 30, IsNullable = true)] + public string WeighType { get; set; } + + /// + /// 称重重量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "称重重量", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable WeighKGS { get; set; } + + /// + /// 称重联系人 + /// + [SqlSugar.SugarColumn(ColumnDescription = "称重联系人", Length = 30, IsNullable = true)] + public string WeighAttn { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs index 77a18e87..1fc291c9 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs @@ -313,7 +313,7 @@ namespace DS.WMS.Core.Op.Entity /// Cancellation时间 /// [SqlSugar.SugarColumn(ColumnDescription = "Cancellation时间", IsNullable = true)] - public Nullable CANCELLATION_DATE { get; set; } + public Nullable CancellationDate { get; set; } /// @@ -355,19 +355,19 @@ namespace DS.WMS.Core.Op.Entity /// /// 拆票或合票标记 1-拆票 2-合票 /// - [Description("拆票或合票标记")] - public Nullable SPLIT_OR_MERGE_FLAG { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "船公司航次", IsNullable = true)] + public Nullable SplitOrMergeFlag { get; set; } /// /// 舱保类型 FULL-全舱保；PART-部分舱保 /// - [Description("舱保类型")] - public string LOAD_GUARANTEE_FLAG { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "舱保类型 FULL-全舱保；PART-部分舱保", Length = 20, IsNullable = true)] + public string LoadGuaranteeFlag { get; set; } // /// 舱保类型名称 FULL-全舱保；PART-部分舱保 /// - [Description("舱保类型名称")] - public string LOAD_GUARANTEE_FLAG_NAME { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "舱保类型名称 FULL-全舱保；PART-部分舱保", Length = 50, IsNullable = true)] + public string LoadGuaranteeFlagName { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotCtn.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotCtn.cs index ee93b9ba..cc4db2d5 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotCtn.cs +++ b/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 + /// + /// 舱位集装箱管理 + /// + [SqlSugar.SugarTable("op_sea_booking_slot_ctn", "舱位集装箱管理")] + public class BookingSlotCtn : BaseModelV2 { + /// + /// 舱位主键 + /// + [SqlSugar.SugarColumn(ColumnDescription = "舱位主键", IsNullable = false)] + public long SlotId { get; set; } + + /// + /// 箱型代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型代码", Length = 10, IsNullable = true)] + public string CtnCode { get; set; } + + /// + /// 箱型名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型名称", Length = 20, IsNullable = true)] + public string CtnAll { get; set; } + + /// + /// 箱量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱量", IsNullable = true, DefaultValue = "0")] + public int CtnNum { get; set; } + + /// + /// 箱号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱号", Length = 30, IsNullable = true)] + public string CNTRNo { get; set; } + + /// + /// 箱封号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱封号", Length = 20, IsNullable = true)] + public string SealNo { get; set; } + + /// + /// 件数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "件数", IsNullable = true)] + public Nullable PKGS { get; set; } + + /// + /// 包装 + /// + [SqlSugar.SugarColumn(ColumnDescription = "件数", Length = 20, IsNullable = true)] + public string KindPKGs { get; set; } + + /// + /// 毛重 + /// + [SqlSugar.SugarColumn(ColumnDescription = "毛重", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable KGS { get; set; } + + /// + /// 尺码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "尺码", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable CBM { get; set; } + + /// + /// 皮重 + /// + [SqlSugar.SugarColumn(ColumnDescription = "皮重", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable TareWeight { get; set; } + + /// + /// 箱状态 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱状态", Length = 10, IsNullable = true)] + public string CtnStatus { get; set; } + + /// + /// 称重方式 + /// + [SqlSugar.SugarColumn(ColumnDescription = "称重方式", Length = 30, IsNullable = true)] + public string WeighType { get; set; } + + /// + /// 称重重量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "称重重量", Length = 18, DecimalDigits = 4, IsNullable = true)] + public Nullable WeighKGS { get; set; } + + /// + /// 称重联系人 + /// + [SqlSugar.SugarColumn(ColumnDescription = "称重联系人", Length = 30, IsNullable = true)] + public string WeighAttn { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemand.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemand.cs index afb21be3..c81ebe43 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemand.cs +++ b/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 + /// + /// 舱位分配表 + /// + [SqlSugar.SugarTable("op_sea_booking_slot_allocation", "舱位分配表")] + public class BookingSlotDemand : BaseModelV2 { + /// + /// 客户ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "客户ID", IsNullable = true)] + public Nullable CustomerId { get; set; } + + /// + /// 客户名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "客户名称", Length = 20, IsNullable = true)] + public string CustomerName { get; set; } + + /// + /// 装货港代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "装货港代码", Length = 10, IsNullable = true)] + public string PortLoadId { get; set; } + + /// + /// 装货港 + /// + [SqlSugar.SugarColumn(ColumnDescription = "装货港", Length = 120, IsNullable = true)] + public string PortLoad { get; set; } + + /// + /// 卸货港代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港代码", Length = 10, IsNullable = true)] + public string PortDischargeId { get; set; } + + /// + /// 卸货港 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港", Length = 120, IsNullable = true)] + public string PortDischarge { get; set; } + + /// + /// 船公司ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司ID", IsNullable = true)] + public Nullable CarrierId { get; set; } + + /// + /// 船公司代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司代码", Length = 20, IsNullable = true)] + public string CarrierCode { get; set; } + + /// + /// 船公司 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司", Length = 20, IsNullable = true)] + public string Carrier { get; set; } + + /// + /// 预计开船日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "预计开船日期", IsNullable = true)] + public Nullable ETD { get; set; } + + /// + /// 预计到港日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "预计到港日期", IsNullable = true)] + public Nullable ETA { get; set; } + + /// + /// 备注 + /// + [SqlSugar.SugarColumn(ColumnDescription = "备注", Length = 200, IsNullable = true)] + public string Remark { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemandCtn.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemandCtn.cs index 1fc6e0dc..a1f6885a 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotDemandCtn.cs +++ b/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 + /// + /// 舱位需求预报记录箱信息 + /// + [SqlSugar.SugarTable("op_sea_booking_slot_demand_ctn", "舱位需求预报记录箱信息")] + public class BookingSlotDemandCtn : BaseModelV2 { + /// + /// 舱位需求预报记录ID + /// + [SqlSugar.SugarColumn(ColumnDescription = "舱位需求预报记录ID", IsNullable = false)] + public long DemandId { get; set; } + + /// + /// 箱型代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型代码", Length = 10, IsNullable = true)] + public string CtnCode { get; set; } + + /// + /// 箱型名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型名称", Length = 20, IsNullable = true)] + public string CtnAll { get; set; } + + /// + /// 箱量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱量", IsNullable = true, DefaultValue = "0")] + public int CtnNum { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotStock.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotStock.cs index d60bc1af..a10f67ad 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotStock.cs +++ b/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 + /// + /// 舱位库存表 + /// + [SqlSugar.SugarTable("op_sea_booking_slot_stock", "舱位库存表")] + public class BookingSlotStock : BaseModelV2 { + /// + /// 船名 + /// + [SqlSugar.SugarColumn(ColumnDescription = "舱位主键", Length = 10, IsNullable = true)] + public string Vessel { get; set; } + + /// + /// 航次号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "航次号", Length = 20, IsNullable = true)] + public string Voyno { get; set; } + + /// + /// 合约号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "合约号", Length = 64, IsNullable = true)] + public string ContractNo { get; set; } + + /// + /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 20, IsNullable = true)] + public string BookingSlotType { get; set; } + + /// + /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 40, IsNullable = true)] + public string BookingSlotTypeName { get; set; } + + /// + /// 订舱抬头 + /// + [SqlSugar.SugarColumn(ColumnDescription = "订舱抬头", Length = 120, IsNullable = true)] + public string BookingParty { get; set; } + + /// + /// 船公司主键 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司主键", IsNullable = true)] + public long CarrierId { get; set; } + + /// + /// 船公司代号 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司代号", Length = 20, IsNullable = true)] + public string CarrierCode { get; set; } + + /// + /// 船公司 + /// + [SqlSugar.SugarColumn(ColumnDescription = "船公司代号", Length = 50, IsNullable = true)] + public string Carrier { get; set; } + + /// + /// 预计开船日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "预计开船日期", IsNullable = true)] + public Nullable ETD { get; set; } + + /// + /// 预计到港日期 + /// + [SqlSugar.SugarColumn(ColumnDescription = "预计到港日期", IsNullable = true)] + public Nullable ETA { get; set; } + + /// + /// 收货地 + /// + [SqlSugar.SugarColumn(ColumnDescription = "收货地", Length = 120, IsNullable = true)] + public string PlaceReceipt { get; set; } + + /// + /// 交货地 + /// + [SqlSugar.SugarColumn(ColumnDescription = "交货地", Length = 120, IsNullable = true)] + public string PlaceDelivery { get; set; } + + /// + /// 装货港代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "装货港代码", Length = 10, IsNullable = true)] + public string PortLoadId { get; set; } + + /// + /// 装货港 + /// + [SqlSugar.SugarColumn(ColumnDescription = "装货港", Length = 120, IsNullable = true)] + public string PortLoad { get; set; } + + /// + /// 卸货港代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港代码", Length = 10, IsNullable = true)] + public string PortDischargeId { get; set; } + + /// + /// 卸货港 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港", Length = 120, IsNullable = true)] + public string PortDischarge { get; set; } + + /// + /// 卸货港国家代码 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港国家代码", Length = 10, IsNullable = true)] + public string PortDischargeCountryCode { get; set; } + + /// + /// 卸货港国家名称 + /// + [SqlSugar.SugarColumn(ColumnDescription = "卸货港国家代码", Length = 120, IsNullable = true)] + public string PortDischargeCountry { get; set; } + + /// + /// 航线代码（船公司） + /// + [SqlSugar.SugarColumn(ColumnDescription = "航线代码（船公司）", Length = 20, IsNullable = true)] + public string LaneCode { get; set; } + + /// + /// 航线名称（船公司） + /// + [SqlSugar.SugarColumn(ColumnDescription = "航线名称（船公司）", Length = 50, IsNullable = true)] + public string LaneName { get; set; } + + /// + /// 所在周数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "航线名称（船公司）", IsNullable = true)] + public Nullable WeekAt { get; set; } + + /// + /// 箱型箱量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "箱型箱量", Length = 200, IsNullable = true)] + public string CtnStat { get; set; } + + /// + /// 使用箱型箱量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "使用箱型箱量", Length = 200, IsNullable = true)] + public string UseCtnStat { get; set; } + + /// + /// 剩余箱型箱量 + /// + [SqlSugar.SugarColumn(ColumnDescription = "剩余箱型箱量", Length = 200, IsNullable = true)] + public string RemainCtnStat { get; set; } + + /// + /// 总舱位数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "总舱位数", IsNullable = true,DefaultValue = "0")] + public int TotalOrders { get; set; } + + /// + /// 使用舱位数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "使用舱位数", IsNullable = true, DefaultValue = "0")] + public int UseNum { get; set; } + + /// + /// 取消舱位数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "取消舱位数", IsNullable = true, DefaultValue = "0")] + public int CancelNum { get; set; } + + /// + /// 总箱数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "总箱数", IsNullable = true, DefaultValue = "0")] + public int TotalCtns { get; set; } + + /// + /// 使用箱数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "使用箱数", IsNullable = true, DefaultValue = "0")] + public int UseCtnsNum { get; set; } + + /// + /// 剩余箱数 + /// + [SqlSugar.SugarColumn(ColumnDescription = "剩余箱数", IsNullable = true, DefaultValue = "0")] + public int RemainCtnsNum { get; set; } } } diff --git a/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt b/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt index 44310d6a..ef526a07 100644 --- a/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt +++ b/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. diff --git a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 1962674f..629580b7 100644 --- a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi - 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||; + 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||; \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.OpApi/appsettings.json b/ds-wms-service/DS.WMS.OpApi/appsettings.json index 2d30182b..71614810 100644 --- a/ds-wms-service/DS.WMS.OpApi/appsettings.json +++ b/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" } }