海运出口信息相关表

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyReq.cs

@@ -25,7 +25,14 @@ public class CodeFormCopyReq
     /// 字段复制设置
     /// </summary>
     public string Content { get; set; }
-    
+    /// <summary>
+    /// 模板名称
+    /// </summary>
+    public string TemplateName { get; set; }
+    /// <summary>
+    /// 中文视图名
+    /// </summary>
+    public string ColumnView { get; set; }
     /// <summary>
     /// 排序
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormCopyRes.cs

@@ -24,8 +24,11 @@ public class CodeFormCopyRes
     /// 字段设置
     /// </summary>
     public string Content { get; set; }
-    
-    
+
+    /// <summary>
+    /// 中文视图名
+    /// </summary>
+    public string ColumnView { get; set; }
     /// <summary>
     /// 模板名称
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormSetReq.cs

@@ -25,7 +25,10 @@ public class CodeFormSetReq
     /// 模板名称
     /// </summary>
     public string TemplateName { get; set; }
-
+    /// <summary>
+    /// 中文视图名
+    /// </summary>
+    public string ColumnView { get; set; }
     /// <summary>
     /// 是否公共标识
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFormSetRes.cs

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using SqlSugar;
 
 namespace DS.WMS.Core.Code.Dtos;
 
@@ -21,10 +22,18 @@ public class CodeFormSetRes
     /// </summary>
     public string PermissionName { get; set; }
     /// <summary>
+    /// 中文视图名
+    /// </summary>
+    public string ColumnView { get; set; }
+    /// <summary>
     /// 字段设置
     /// </summary>
     public string Content { get; set; }
-     
+    /// <summary>
+    /// 模板名称
+    /// </summary>
+    public string TemplateName { get; set; }
+
     /// <summary>
     /// 状态 0 启用 1 禁用
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormCopy.cs

@@ -21,10 +21,15 @@ public class CodeFormCopy : BaseOrgModel<long>
     [SugarColumn(ColumnDescription = "权限模块名称", IsNullable = false,Length = 50)]
     public string PermissionName { get; set; }
 
+    /// <summary>
+    /// 中文视图名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "中文视图名", IsNullable = false, Length = 100)]
+    public string ColumnView { get; set; }
     /// <summary>
     /// 模板名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "模板名称", IsNullable = false)]
+    [SugarColumn(ColumnDescription = "模板名称", IsNullable = false, Length = 50)]
     public string TemplateName { get; set; }
 
     /// <summary>

ds-wms-service/DS.WMS.Core/Code/Entity/CodeFormSet.cs

@@ -20,6 +20,17 @@ public class CodeFormSet : BaseOrgModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "权限模块名称", IsNullable = false,Length = 50)]
     public string PermissionName { get; set; }
+
+    /// <summary>
+    /// 中文视图名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "中文视图名", IsNullable = false, Length = 100)]
+    public string ColumnView { get; set; }
+    /// <summary>
+    /// 模板名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "模板名称", IsNullable = false, Length = 50)]
+    public string TemplateName { get; set; }
     /// <summary>
     /// 表单设置
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientContactReq.cs

@@ -19,70 +19,100 @@ public class ClientContactReq
     public long ClientId { get; set; }
 
     /// <summary>
-    /// Desc:代码
+    /// Desc:联系人代码
     /// </summary>
     public string CodeName { get; set; }
 
     /// <summary>
-    /// Desc:币别
+    /// Desc:联系人简称
     /// </summary>
-    public string Currency { get; set; }
+    public string ShortName { get; set; }
+
+
+    /// <summary>
+    /// Desc:职务
+    /// </summary>
+    public string Job { get; set; }
+
+    /// <summary>
+    /// Desc:通讯地址
+    /// </summary>
+    public string Address { get; set; }
+
+    /// <summary>
+    /// Desc:邮箱
+    /// </summary>
+    public string Email { get; set; }
 
     /// <summary>
-    /// Desc:银行名称
+    /// Desc:手机
     /// </summary>
-    public string BankName { get; set; }
+    public string Mobile { get; set; }
 
     /// <summary>
-    /// Desc:银行账户
+    /// Desc:电话
     /// </summary>
-    public string Account { get; set; }
+    public string Tel { get; set; }
 
     /// <summary>
-    /// Desc:银行地址
+    /// Desc:传真
     /// </summary>
-    public string BankAddress { get; set; }
+    public string Fax { get; set; }
 
     /// <summary>
-    /// Desc:财务软件代码
+    /// Desc:QQ
     /// </summary>
-    public string FinanceSoftCode { get; set; }
+    public string QQ { get; set; }
 
     /// <summary>
-    /// Desc:科目代码
+    /// Desc:是否为操作
     /// </summary>
-    public string SubjectCode { get; set; }
+    public bool? IsOperator { get; set; } = false;
 
     /// <summary>
-    /// Desc:户头名称
+    /// Desc:是否为财务
     /// </summary>
-    public string AccountName { get; set; }
+    public bool? IsFinancialStaff { get; set; } = false;
 
     /// <summary>
-    /// Desc:代理银行名称
+    /// Desc:是否为销售
     /// </summary>
-    public string BankAgentName { get; set; }
+    public bool? IsSaleMan { get; set; } = false;
 
     /// <summary>
-    /// Desc:银行账号
+    /// Desc:是否为其他
     /// </summary>
-    public string BankAccountNo { get; set; }
+    public bool? IsOther { get; set; } = false;
 
     /// <summary>
-    /// Desc: 银行SWIFT
+    /// Desc:是否保险联系人
     /// </summary>
-    public string SWIFT { get; set; }
+    public bool? IsInsurance { get; set; } = false;
 
+    /// <summary>
+    /// Desc:是否对账联系人
+    /// </summary>
+    public bool? IsCheckAccount { get; set; } = false;
+
+    /// <summary>
+    /// 提醒日期1
+    /// </summary>
+    public DateTime Anniversary1 { get; set; }
+
+    /// <summary>
+    /// 提醒日期2
+    /// </summary>
+    public DateTime Anniversary2 { get; set; }
 
     /// <summary>
-    /// Desc: 国家Id
+    /// 提醒备注1
     /// </summary>
-    public long? CountryId { get; set; }
+    public string AnniversaryNote1 { get; set; }
 
     /// <summary>
-    /// Desc:是否开票默认账户
+    /// 提醒备注2
     /// </summary>
-    public bool? IsInvoiceDefault { get; set; } = false;
+    public string AnniversaryNote2 { get; set; }
 
     /// <summary>
     /// 状态 0 启用 1 禁用
@@ -107,9 +137,9 @@ public class ClientContactReqValidator : AbstractValidator<ClientContactReq>
     /// </summary>
     public ClientContactReqValidator()
     {
-        this.RuleFor(o => o.BankName)
-            .NotEmpty().WithName("银行名称");
-        this.RuleFor(o => o.Currency)
-            .NotEmpty().WithName("币别");
+        this.RuleFor(o => o.CodeName)
+            .NotEmpty().WithName("联系人代码");
+        this.RuleFor(o => o.ShortName)
+            .NotEmpty().WithName("联系人简称");
     }
 }

ds-wms-service/DS.WMS.Core/Sea/Entity/OpCtn.cs

@@ -0,0 +1,244 @@
+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.Sea.Entity
+{
+    /// <summary>
+    /// 集装箱信息
+    /// </summary>
+    [SqlSugar.SugarTable("op_ctn", "集装箱信息")]
+    public  class OpCtn : BaseOrgModel<long>
+    {
+
+        /// <summary>
+        /// 业务编号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "业务编号", IsNullable = false, Length = 100)]
+        public string BSNO { get; set; }
+        /// <summary>
+        /// 箱型代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱型代码", IsNullable = true, Length = 4)]
+        public string CtnCode { get; set; }
+
+        /// <summary>
+        /// 尺寸
+        /// </summary>
+        [SugarColumn(ColumnDescription = "尺寸", IsNullable = true, Length = 3)]
+        public string Size { get; set; }
+
+        /// <summary>
+        /// 箱型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱型", IsNullable = true, Length = 10)]
+        public string Ctn { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱量", DefaultValue = "0")]
+        public int CtnNum { get; set; }
+
+        /// <summary>
+        /// TEU
+        /// </summary>
+        [SugarColumn(ColumnDescription = "TEU", DefaultValue = "0")]
+        public int TEU { get; set; }
+
+        /// <summary>
+        /// 表现形式
+        /// </summary>
+        [SugarColumn(ColumnDescription = "表现形式", IsNullable = true, Length = 10)]
+        public string CtnAll { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱号", IsNullable = true, Length = 30)]
+        public string CntrNo { get; set; }
+
+        /// <summary>
+        /// 封号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "封号", IsNullable = true, Length = 20)]
+        public string SealNo { get; set; }
+
+        /// <summary>
+        /// 件数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "件数", IsNullable = true)]
+        public int? PKGS { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        [SugarColumn(ColumnDescription = "毛重", IsNullable = true, Length = 18, DecimalDigits = 3, DefaultValue = "0")]
+        public decimal? KGS { get; set; }
+
+        /// <summary>
+        /// 尺码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "尺码", IsNullable = true, Length = 18, DecimalDigits = 3, DefaultValue = "0")]
+        public decimal? CBM { get; set; }
+
+        /// <summary>
+        /// 包装    t_code_package
+        /// </summary>
+        [SugarColumn(ColumnDescription = "包装", IsNullable = true, Length = 20)]
+        public string KindPkgs { get; set; }
+
+
+        /// <summary>
+        /// 皮重
+        /// </summary>
+        [SugarColumn(ColumnDescription = "皮重", IsNullable = true, Length = 18, DecimalDigits = 3, DefaultValue = "0")]
+        public decimal? TareWeight { get; set; }
+
+        /// <summary>
+        /// 品名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "品名", IsNullable = true, Length = 30)]
+        public string GoodsName { get; set; }
+
+        /// <summary>
+        /// 箱状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱状态", IsNullable = true, Length = 10)]
+        public string CtnStatus { get; set; }
+
+        /// <summary>
+        /// 称重方式
+        /// </summary>
+        [SugarColumn(ColumnDescription = "称重方式", IsNullable = true, Length = 30)]
+        public string WeightType { get; set; }
+
+        /// <summary>
+        /// 称重重量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "称重重量", IsNullable = true, Length = 18, DecimalDigits = 3, DefaultValue = "0")]
+        public decimal? WeightKGS { get; set; }
+
+        /// <summary>
+        /// VGM联系人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "VGM联系人", IsNullable = true, Length = 20)]
+        public string WeightATTN { get; set; }
+        /// <summary>
+        /// VGM联系人电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "VGM联系人电话", IsNullable = true, Length = 20)]
+        public string WeightTel { get; set; }
+        /// <summary>
+        /// VGM联系人签名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "VGM联系人签名", IsNullable = true, Length = 20)]
+        public string WeightSign { get; set; }
+
+        /// <summary>
+        /// VGM称重日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "VGM称重日期", IsNullable = true, Length = 20)]
+        public string WeightDate { get; set; }
+
+        /// <summary>
+        /// 主票业务编号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "主票业务编号", IsNullable = false, Length = 100)]
+        public string MasterNo { get; set; }
+
+
+        /// <summary>
+        /// 承运车队
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "承运车队", IsNullable = false, Length = 20)]
+        public string Trucker { get; set; }
+        /// <summary>
+        /// 车号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "车号", IsNullable = false, Length = 30)]
+        public string TruckNo { get; set; }
+        /// <summary>
+        /// 运费
+        /// </summary>
+        [SugarColumn(ColumnDescription = "运费", IsNullable = true, Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        public decimal? TruckFee { get; set; }
+
+        /// <summary>
+        /// 免堆存天数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "免堆存天数", DefaultValue = "0")]
+        public int FreeStorageDay { get; set; }
+        /// <summary>
+        /// 堆存天数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "堆存天数", DefaultValue = "0")]
+        public int StorageDay { get; set; }
+
+        /// <summary>
+        /// 堆存费/天
+        /// </summary>
+        [SugarColumn(ColumnDescription = "堆存费/天", IsNullable = true, Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        public decimal? StoragePrice { get; set; }
+        /// <summary>
+        /// 堆存费
+        /// </summary>
+        [SugarColumn(ColumnDescription = "堆存费", IsNullable = true, Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        public decimal? StorageFee { get; set; }
+
+        /// <summary>
+        /// 免箱使天数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "免箱使天数", DefaultValue = "0")]
+        public int FreeCtnDay { get; set; }
+        /// <summary>
+        /// 箱使天数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱使天数", DefaultValue = "0")]
+        public int CtnDay { get; set; }
+
+        /// <summary>
+        /// 箱使费/天
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱使费/天", IsNullable = true, Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        public decimal? CtnPrice { get; set; }
+        /// <summary>
+        /// 箱使费
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱使费", IsNullable = true, Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        public decimal? CtnFee { get; set; }
+
+
+        /// <summary>
+        /// Desc:是否暂出
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否暂出", DefaultValue = "0")]
+        public bool? IsTemp { get; set; } = false;
+
+        /// <summary>
+        /// VGM地址
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "VGM地址", IsNullable = false, Length = 100)]
+        public string VGMAddr { get; set; }
+        /// <summary>
+        /// VGM邮箱
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "VGM邮箱", IsNullable = false, Length = 60)]
+        public string VGMEmail { get; set; }
+
+        /// <summary>
+        /// 提箱时间
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "提箱时间", IsNullable = false, Length = 50)]
+        public string PickUpTime { get; set; }
+        /// <summary>
+        /// 实际到港时间
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "实际到港时间", IsNullable = false, Length = 50)]
+        public string ActualArrivalPortTime { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/Sea/Entity/OpCtnDetail.cs

@@ -0,0 +1,69 @@
+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.Sea.Entity
+{
+    /// <summary>
+    /// 集装箱多品名明细
+    /// </summary>
+    [SqlSugar.SugarTable("op_ctn_detail", "集装箱多品名明细")]
+    public class OpCtnDetail : BaseModel<long>
+    {
+        /// <summary>
+        /// CtnId
+        /// </summary>
+        [SugarColumn(ColumnDescription = "CtnId")]
+        public long CtnId { get; set; }
+        /// <summary>
+        /// 件数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "件数", IsNullable = true)]
+        public int? PKGS { get; set; }
+
+        /// <summary>
+        /// 毛重
+        /// </summary>
+        [SugarColumn(ColumnDescription = "毛重", IsNullable = true, Length = 18, DecimalDigits = 4, DefaultValue = "0")]
+        public decimal? KGS { get; set; }
+
+        /// <summary>
+        /// 尺码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "尺码", IsNullable = true, Length = 18, DecimalDigits = 4, DefaultValue = "0")]
+        public decimal? CBM { get; set; }
+
+        /// <summary>
+        /// 包装    t_code_package
+        /// </summary>
+        [SugarColumn(ColumnDescription = "包装", IsNullable = true, Length = 20)]
+        public string KindPkgs { get; set; }
+
+        /// <summary>
+        /// 海关代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "海关代码", Length = 50, IsNullable = true)]
+        public string HSCode { get; set; }
+
+        /// <summary>
+        /// 唛头    N/M
+        /// </summary>
+        [SugarColumn(ColumnDescription = "唛头", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string Marks
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 货物描述
+        /// </summary>
+        [SugarColumn(ColumnDescription = "货物描述", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string Description
+        {
+            get; set;
+        }
+    }
+}

ds-wms-service/DS.WMS.Core/Sea/Entity/OpLetter.cs

@@ -0,0 +1,65 @@
+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.Sea.Entity
+{
+    /// <summary>
+    /// 函电信息主表
+    /// </summary>
+    [SqlSugar.SugarTable("op_letter", "函电信息主表")]
+    public  class OpLetter : BaseOrgModel<long>
+    {
+
+        /// <summary>
+        /// 业务编号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "业务编号", IsNullable = false, Length = 100)]
+        public string BSNO { get; set; }
+        /// <summary>
+        /// 通知人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "通知人", IsNullable = true, Length = 60)]
+        public string HeadTo { get; set; }
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "联系人", IsNullable = true, Length = 30)]
+        public string HeadATTN { get; set; }
+        /// <summary>
+        /// 函电名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "函电名称", IsNullable = true, Length = 100)]
+        public string LetterName { get; set; }
+        /// <summary>
+        /// ATTN电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ATTN电话", IsNullable = true, Length = 30)]
+        public string HeadATTNTel { get; set; }
+        /// <summary>
+        /// ATTN传真
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ATTN传真", IsNullable = true, Length = 30)]
+        public string HeadATTNFax { get; set; }
+
+        /// <summary>
+        /// FROM电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "summary", IsNullable = true, Length = 100)]
+        public string HeadFromTel { get; set; }
+        /// <summary>
+        /// FROM传真
+        /// </summary>
+        [SugarColumn(ColumnDescription = "FROM传真", IsNullable = true, Length = 100)]
+        public string HeadFromFax { get; set; }
+        /// <summary>
+        /// FROM邮箱
+        /// </summary>
+        [SugarColumn(ColumnDescription = "FROM邮箱", IsNullable = true, Length = 100)]
+        public string HeadFromEmail { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/Sea/Entity/OpLetterChange.cs

@@ -0,0 +1,85 @@
+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.Sea.Entity
+{
+    /// <summary>
+    ///  函电信息更改通知
+    /// </summary>
+    [SqlSugar.SugarTable("op_letter_change", " 函电信息更改通知")]
+    public  class OpLetterChange : BaseOrgModel<long>
+    {
+        /// <summary>
+        /// LetterId
+        /// </summary>
+        [SugarColumn(ColumnDescription = "LetterId")]
+        public long LetterId { get; set; }
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "主提单号", IsNullable = false, Length = 30)]
+        public string MBLNO { get; set; }
+
+        /// <summary>
+        /// 卸货港
+        /// </summary>
+        [SugarColumn(ColumnDescription = "卸货港", Length = 60, IsNullable = true)]
+        public string DischargePort { get; set; }
+
+        /// <summary>
+        /// 船名航次
+        /// </summary>
+        [SugarColumn(ColumnDescription = "卸货港", Length = 100, IsNullable = true)]
+        public string VesselVoyNo { get; set; }
+
+        /// <summary>
+        /// 开船日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "开船日期", IsNullable = true)]
+        public DateTime? ETD { get; set; }
+
+        
+        /// <summary>
+        /// 件重尺
+        /// </summary>
+        [SugarColumn(ColumnDescription = "目的地", IsNullable = true, Length = 100)]
+        public string PKC { get; set; }
+
+
+        /// <summary>
+        /// 箱型箱量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "箱型箱量", IsNullable = true, Length = 100)]
+        public string CNTR { get; set; }
+        /// <summary>
+        /// 更改项目
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更改项目", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string ProjectName { get; set; }
+        /// <summary>
+        /// 原内容
+        /// </summary>
+        [SugarColumn(ColumnDescription = "原内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string OldContent { get; set; }
+        /// <summary>
+        /// 现内容
+        /// </summary>
+        [SugarColumn(ColumnDescription = "现内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string NewContent { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string Remark
+        {
+            get; set;
+        }
+
+         
+    }
+}

ds-wms-service/DS.WMS.Core/Sea/Entity/OpLetterSur.cs

@@ -0,0 +1,58 @@
+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.Sea.Entity
+{
+    /// <summary>
+    /// 函电信息电放保函
+    /// </summary>
+    [SqlSugar.SugarTable("op_letter_sur", "函电信息电放保函")]
+    public  class OpLetterSur : BaseOrgModel<long>
+    {
+        /// <summary>
+        /// LetterId
+        /// </summary>
+        [SugarColumn(ColumnDescription = "LetterId")]
+        public long LetterId { get; set; }
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "主提单号", IsNullable = false, Length = 30)]
+        public string MBLNO { get; set; }
+        /// <summary>
+        /// 装货港
+        /// </summary>
+        [SugarColumn(ColumnDescription = "装货港", Length = 60, IsNullable = true)]
+        public string LoadPort { get; set; }
+        /// <summary>
+        /// 卸货港
+        /// </summary>
+        [SugarColumn(ColumnDescription = "卸货港", Length = 60, IsNullable = true)]
+        public string DischargePort { get; set; }
+
+        /// <summary>
+        /// 船名航次
+        /// </summary>
+        [SugarColumn(ColumnDescription = "卸货港", Length = 100, IsNullable = true)]
+        public string VesselVoyNo { get; set; }
+
+        /// <summary>
+        /// 收货人内容
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "收货人内容", IsNullable = true, Length = 600)]
+        public string ConsigneeContent { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string Remark { get; set; }
+
+
+    }
+}

ds-wms-service/DS.WMS.Core/Sea/Entity/OpLetterTruck.cs

@@ -0,0 +1,165 @@
+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.Sea.Entity
+{
+    /// <summary>
+    ///  函电信息派车通知
+    /// </summary>
+    [SqlSugar.SugarTable("op_letter_truck", " 函电信息派车通知")]
+    public class OpLetterTruck : BaseOrgModel<long>
+    {
+        /// <summary>
+        /// LetterId
+        /// </summary>
+        [SugarColumn(ColumnDescription = "LetterId")]
+        public long LetterId { get; set; }
+
+        /// <summary>
+        /// 车队Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "车队Id")]
+        public long TruckId { get; set; }
+        /// <summary>
+        /// 陆运费
+        /// </summary>
+        [SugarColumn(ColumnDescription = "陆运费", IsNullable = true, Length = 18, DecimalDigits = 3, DefaultValue = "0")]
+        public decimal? TruckFee { get; set; }
+        /// <summary>
+        /// 结算方式
+        /// </summary> 
+        [SugarColumn(ColumnDescription = "结算方式", IsNullable = true, Length = 20)]
+        public string PayType { get; set; }
+        /// <summary>
+        /// 箱型箱量
+        /// </summary> 
+        [SugarColumn(ColumnDescription = "箱型箱量", IsNullable = true, Length = 60)]
+        public string CNTR { get; set; }
+
+        /// <summary>
+        /// 提箱场站
+        /// </summary>
+        [SugarColumn(ColumnDescription = "YardId")]
+        public long YardId { get; set; }
+        /// <summary>
+        /// 场站联系人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "场站联系人", IsNullable = true, Length = 200)]
+        public string YardATTN { get; set; }
+        /// <summary>
+        /// 场站电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "场站电话", IsNullable = true, Length = 100)]
+        public string YardTel { get; set; }
+        /// <summary>
+        /// 工厂名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工厂名称", IsNullable = true, Length = 100)]
+        public string FactoryName { get; set; }
+        /// <summary>
+        /// 工厂联系人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工厂联系人", IsNullable = true, Length = 50)]
+        public string FactoryATTN { get; set; }
+        /// <summary>
+        /// 工厂电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工厂名称", IsNullable = true, Length = 20)]
+        public string FactoryTel { get; set; }
+        /// <summary>
+        /// 工厂地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工厂地址", IsNullable = true, Length = 200)]
+        public string FactoryAddress { get; set; }
+
+        /// <summary>
+        /// 要求到厂时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "要求到厂时间", IsNullable = true, Length = 60)]
+        public string FactoryTime { get; set; }
+
+        /// <summary>
+        ///返箱场站
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返箱场站Id")]
+        public long ReturnYardId { get; set; }
+        /// <summary>
+        /// 返箱地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返箱地址", IsNullable = true, Length = 200)]
+        public string? Returnddress { get; set; }
+        /// <summary>
+        /// 返箱电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返箱电话", IsNullable = true, Length = 100)]
+        public string ReturnTel { get; set; }
+
+        /// <summary>
+        /// 返箱联系人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返箱联系人")]
+        public long ReturnATTN { get; set; }
+
+
+        /// <summary>
+        /// 返厂时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返厂时间", IsNullable = true, Length = 60)]
+        public string? ReturnYardTime { get; set; }
+
+        /// <summary>
+        /// 派车日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "派车日期", IsNullable = true)]
+        public DateTime? TruckDate { get; set; }
+
+        /// <summary>
+        /// 截港日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "截港日期", IsNullable = true)]
+        public DateTime? ClosingDate { get; set; }
+
+        /// <summary>
+        /// 提货时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "提货时间", IsNullable = true)]
+        public DateTime CargoDate { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 100)]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 注意事项
+        /// </summary>
+        [SugarColumn(ColumnDescription = "注意事项", IsNullable = true, Length = 100)]
+        public string TruckDetail { get; set; }
+        
+
+        /// <summary>
+        /// 派车状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "派车状态", IsNullable = true, DefaultValue ="0")]
+        public int TruckStatus { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备注", IsNullable = true, Length = 100)]
+        public string BSNO { get; set; }
+
+        ///// <summary>
+        ///// TeamType
+        ///// </summary>
+        //[SugarColumn(ColumnDescription = "TeamType", IsNullable = true, DefaultValue = "0")]
+        //public int TeamType { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/Sea/Entity/OpLetterYard.cs

@@ -0,0 +1,185 @@
+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.Sea.Entity
+{
+    /// <summary>
+    /// 函电信息入货通知
+    /// </summary>
+    [SqlSugar.SugarTable("op_letter_yard", "函电信息入货通知")]
+    public  class OpLetterYard : BaseOrgModel<long>
+    {
+        /// <summary>
+        /// LetterId
+        /// </summary>
+        [SugarColumn(ColumnDescription = "LetterId")]
+        public long LetterId { get; set; }
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "主提单号", IsNullable = false, Length = 30)]
+        public string MBLNO { get; set; }
+
+        /// <summary>
+        /// 卸货港
+        /// </summary>
+        [SugarColumn(ColumnDescription = "卸货港", Length = 60, IsNullable = true)]
+        public string DischargePort { get; set; }
+
+        /// <summary>
+        /// 船名航次
+        /// </summary>
+        [SugarColumn(ColumnDescription = "卸货港", Length = 100, IsNullable = true)]
+        public string VesselVoyNo { get; set; }
+
+        /// <summary>
+        /// 开船日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "开船日期", IsNullable = true)]
+        public DateTime? ETD { get; set; }
+
+        /// <summary>
+        /// 目的地
+        /// </summary> 
+        [SugarColumn(ColumnDescription = "目的地", IsNullable = true, Length = 60)]
+        public string Destination { get; set; }
+        /// <summary>
+        /// 件重尺
+        /// </summary>
+        [SugarColumn(ColumnDescription = "目的地", IsNullable = true, Length = 100)]
+        public string PKC { get; set; }
+
+        /// <summary>
+        /// 货物描述
+        /// </summary>
+        [SugarColumn(ColumnDescription = "货物描述", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string Description { get; set; }
+        /// <summary>
+        /// 提箱场站
+        /// </summary>
+        [SugarColumn(ColumnDescription = "YardId")]
+        public long YardId { get; set; }
+        /// <summary>
+        /// 地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "地址", IsNullable = true, Length = 200)]
+        public string Address { get; set; }
+        /// <summary>
+        /// 电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "电话", IsNullable = true, Length = 100)]
+        public string Tel { get; set; }
+
+        /// <summary>
+        /// 提箱联系人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "提箱联系人")]
+        public long ATTN { get; set; }
+
+        /// <summary>
+        /// 入货场站
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入货场站Id")]
+        public long ReceiveYardId { get; set; }
+        /// <summary>
+        /// 入货地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入货地址", IsNullable = true, Length = 200)]
+        public string ReceiveAddress { get; set; }
+        /// <summary>
+        /// 入货电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入货电话", IsNullable = true, Length = 100)]
+        public string ReceiveTel { get; set; }
+
+        /// <summary>
+        /// 入货联系人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入货联系人")]
+        public long ReceiveATTN { get; set; }
+
+        /// <summary>
+        /// Desc:单证
+        /// </summary>
+        [SugarColumn(ColumnDescription = "单证")]
+        public long Doc { get; set; }
+        /// <summary>
+        /// 单证电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "单证电话", IsNullable = true, Length = 100)]
+        public string DocTel { get; set; }
+        /// <summary>
+        /// 单证传真
+        /// </summary>
+        [SugarColumn(ColumnDescription = "单证传真", IsNullable = true, Length = 100)]
+        public string DocFax { get; set; }
+        /// <summary>
+        /// 单证邮箱
+        /// </summary>
+        [SugarColumn(ColumnDescription = "单证邮箱", IsNullable = true, Length = 100)]
+        public string DocEmail { get; set; }
+
+        /// <summary>
+        /// 截港日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "截港日期", IsNullable = true)]
+        public DateTime? ClosingDate { get; set; }
+
+        /// <summary>
+        /// 截单日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "截单日期", IsNullable = true)]
+        public DateTime CloseDocDate { get; set; }
+        /// <summary>
+        /// 截VGM日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "截VGM日期", IsNullable = true)]
+        public DateTime CloseVGMDate { get; set; }
+        /// <summary>
+        /// 出口海关
+        /// </summary>
+        [SugarColumn(ColumnDescription = "出口海关", IsNullable = true, Length = 100)]
+        public string ExportCustoms { get; set; }
+        /// <summary>
+        /// 海关代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "海关代码", IsNullable = true, Length = 100)]
+        public string CustomsCode { get; set; }
+
+        /// <summary>
+        /// 报关代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "报关代码", IsNullable = true, Length = 100)]
+        public string DeclarationCode { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 提箱小票地址
+        /// </summary>
+        [SugarColumn(ColumnDescription = "提箱小票地址", IsNullable = true, Length = 260)]
+        public string PickReceiptUrl { get; set; }
+
+        /// <summary>
+        /// 提箱时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "提箱时间", IsNullable = true)]
+        public DateTime PickTime { get; set; }
+
+
+        /// <summary>
+        /// 入货时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入货时间", IsNullable = true)]
+        public DateTime ReceiveTime { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/Sea/Entity/SeaExport.cs

@@ -196,9 +196,9 @@ public class SeaExport : BaseOrgModel<long>
     public string ReceiptPlace { get; set; }
 
     /// <summary>
-    /// 装货港Id
+    /// 收货地点Id
     /// </summary>
-    [SugarColumn(ColumnDescription = "装货港Id", IsNullable = true, DefaultValue = "0")]
+    [SugarColumn(ColumnDescription = "收货地点Id", IsNullable = true, DefaultValue = "0")]
     public long ReceiptPlaceId { get; set; }
 
     /// <summary>

ds-wms-service/DS.WMS.Core/Sea/Entity/SeaExportBillManage.cs

@@ -0,0 +1,457 @@
+using DS.Module.Core.Data;
+using SqlSugar;
+
+namespace DS.WMS.Core.Sea.Entity;
+
+/// <summary>
+/// 海运出口提单信息
+/// </summary>
+[SqlSugar.SugarTable("op_sea_export_billmanage", "海运出口提单信息")]
+public class SeaExportBillManage : BaseOrgModel<long>
+{
+    /// <summary>
+    /// 业务编号
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "业务编号", IsNullable = false, Length = 100)]
+    public string BSNO { get; set; }
+     
+    /// <summary>
+    /// 主提单号
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "主提单号", IsNullable = true, Length = 30)]
+    public string MBLNO { get; set; }
+
+    /// <summary>
+    /// 分提单号
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "分提单号", IsNullable = true, Length = 30)]
+    public string HBLNO { get; set; }
+
+    /// <summary>
+    /// 模板Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "模板Id")]
+    public long TemplateId { get; set; }
+
+    /// <summary>
+    /// 提单类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "提单类型", IsNullable = true,DefaultValue ="0")]
+    public string BillType { get; set; }
+
+    /// <summary>
+    /// 发货人    t_info_client CUSTNAME
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "发货人", IsNullable = true)]
+    public long? ShipperId { get; set; }
+    /// <summary>
+    /// 发货人内容
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "发货人内容", IsNullable = true, Length = 600)]
+    public string ShipperContent { get; set; }
+    /// <summary>
+    /// 发货人企业代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "发货人企业代码", IsNullable = true, Length = 50)]
+    public string ShipperCode { get; set; }
+    /// <summary>
+    /// 发货人国家代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "发货人国家代码", IsNullable = true, Length = 10)]
+    public string ShipperCountry { get; set; }
+    /// <summary>
+    /// 发货人电话
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "发货人电话", IsNullable = true, Length = 50)]
+    public string ShipperTel { get; set; }
+    /// <summary>
+    /// 发货人邮箱
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "发货人邮箱", IsNullable = true, Length = 50)]
+    public string ShipperEmail { get; set; }
+
+
+    /// <summary>
+    /// 收货人    t_info_client CUSTNAME
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "收货人", IsNullable = true)]
+    public long? ConsigneeId { get; set; }
+    /// <summary>
+    /// 收货人内容
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "收货人内容", IsNullable = true, Length = 600)]
+    public string ConsigneeContent { get; set; }
+    /// <summary>
+    /// 收货企业代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "收货人企业代码", IsNullable = true, Length = 50)]
+    public string ConsigneeCode { get; set; }
+    /// <summary>
+    /// 收货人国家代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "收货人国家代码", IsNullable = true, Length = 10)]
+    public string ConsigneeCountry { get; set; }
+    /// <summary>
+    /// 收货人电话
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "收货人电话", IsNullable = true, Length = 50)]
+    public string ConsigneeTel { get; set; }
+    /// <summary>
+    /// 收货人邮箱
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "收货人邮箱", IsNullable = true, Length = 50)]
+    public string ConsigneeEmail { get; set; }
+
+    /// <summary>
+    /// 通知人    t_info_client CUSTNAME
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "通知人", IsNullable = true)]
+    public long? NotifyPartyId { get; set; }
+    /// <summary>
+    /// 通知人内容
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "通知人内容", IsNullable = true, Length = 600)]
+    public string NotifyPartyContent { get; set; }
+    /// <summary>
+    /// 通知企业代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "通知人企业代码", IsNullable = true, Length = 50)]
+    public string NotifyPartyCode { get; set; }
+    /// <summary>
+    /// 通知人国家代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "通知人国家代码", IsNullable = true, Length = 10)]
+    public string NotifyPartyCountry { get; set; }
+    /// <summary>
+    /// 通知人电话
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "通知人电话", IsNullable = true, Length = 50)]
+    public string NotifyPartyTel { get; set; }
+    /// <summary>
+    /// 通知人邮箱
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "通知人邮箱", IsNullable = true, Length = 50)]
+    public string NotifyPartyEmail { get; set; }
+
+
+    /// <summary>
+    /// 代理人    t_info_client CUSTNAME
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "代理人", IsNullable = true)]
+    public long? AgentId { get; set; }
+    /// <summary>
+    /// 代理人内容
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "代理人内容", IsNullable = true, Length = 600)]
+    public string AgentContent { get; set; }
+
+    /// <summary>
+    /// 第二通知人    t_info_client CUSTNAME
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "第二通知人", IsNullable = true)]
+    public long? SecondNotifyPartyId { get; set; }
+    /// <summary>
+    /// 第二通知人内容
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "第二通知人内容", IsNullable = true, Length = 600)]
+    public string SecondNotifyPartyContent { get; set; }
+    /// <summary>
+    /// 第二通知人企业代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "第二通知人企业代码", IsNullable = true, Length = 50)]
+    public string SecondNotifyPartyCode { get; set; }
+    /// <summary>
+    /// 第二通知人国家代码
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "第二通知人国家代码", IsNullable = true, Length = 10)]
+    public string SecondNotifyPartyCountry { get; set; }
+    /// <summary>
+    /// 第二通知人电话
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "第二通知人电话", IsNullable = true, Length = 50)]
+    public string SecondNotifyPartyTel { get; set; }
+    /// <summary>
+    /// 第二通知人邮箱
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "第二通知人邮箱", IsNullable = true, Length = 50)]
+    public string SecondNotifyPartyEmail { get; set; }
+
+    /// <summary>
+    /// 场站    t_crm_client CUSTNAME
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "场站", IsNullable = true, Length = 20)]
+    public string Yard { get; set; }
+
+    /// <summary>
+    /// 船名    t_code_vessel
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "船名", IsNullable = true, Length = 60)]
+    public string Vessel { get; set; }
+
+    /// <summary>
+    /// 船名Id    t_code_vessel
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "船名Id", IsNullable = true, DefaultValue = "0")]
+    public long VesselId { get; set; }
+
+    /// <summary>
+    /// 航次 
+    /// </summary>
+    [SqlSugar.SugarColumn(ColumnDescription = "航次", IsNullable = true, Length = 20)]
+    public string Voyno { get; set; }
+
+    /// <summary>
+    /// 开船日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "开船日期", IsNullable = true)]
+    public DateTime? ETD { get; set; }
+
+    /// <summary>
+    /// 预抵日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "预抵日期", IsNullable = true)]
+    public DateTime? ETA { get; set; }
+
+    /// <summary>
+    /// ATD
+    /// </summary>
+    [SugarColumn(ColumnDescription = "ATD", IsNullable = true)]
+    public DateTime? ATD { get; set; }
+
+    /// <summary>
+    /// 截港日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "截港日期", IsNullable = true)]
+    public DateTime? ClosingDate { get; set; }
+
+
+    /// <summary>
+    /// 收货地点Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "收货地点Id", IsNullable = true, DefaultValue = "0")]
+    public long ReceiptPlaceId { get; set; }
+
+
+    /// <summary>
+    /// 收货地点
+    /// </summary>
+    [SugarColumn(ColumnDescription = "收货地点", IsNullable = true, Length = 60)]
+    public string ReceiptPlace { get; set; }
+
+    /// <summary>
+    /// 装货港代码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "装货港代码", IsNullable = true)]
+    public long LoadPortId { get; set; }
+
+    /// <summary>
+    /// 装货港
+    /// </summary>
+    [SugarColumn(ColumnDescription = "装货港", IsNullable = true, Length = 60)]
+    public string LoadPort { get; set; }
+
+    /// <summary>
+    /// 卸货港代码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "卸货港代码", IsNullable = true)]
+    public long DischargePortId { get; set; }
+
+    /// <summary>
+    /// 卸货港
+    /// </summary>
+    [SugarColumn(ColumnDescription = "卸货港", IsNullable = true, Length = 60)]
+    public string DischargePort { get; set; }
+
+
+    /// <summary>
+    /// 交货地代码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "交货地代码", IsNullable = true)]
+    public long DeliveryPlaceId { get; set; }
+
+    /// <summary>
+    /// 交货地
+    /// </summary>
+    [SugarColumn(ColumnDescription = "交货地", IsNullable = true, Length = 60)]
+    public string DeliveryPlace { get; set; }
+
+    
+
+
+    /// <summary>
+    /// 目的地代码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "目的地代码", IsNullable = true)]
+    public long DestinationId { get; set; }
+
+    /// <summary>
+    /// 目的地
+    /// </summary>
+    [SugarColumn(ColumnDescription = "目的地", IsNullable = true, Length = 60)]
+    public string Destination { get; set; }
+
+    /// <summary>
+    /// 提单份数 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "提单份数", IsNullable = true, Length = 5)]
+    public string NoBill { get; set; }
+
+    /// <summary>
+    /// 副本份数 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "副本份数", IsNullable = true, Length = 5)]
+    public string CopyNoBill { get; set; }
+
+    /// <summary>
+    /// 签单方式    t_code_issutype 
+    /// </summary>
+    [SugarColumn(ColumnDescription = "签单方式", IsNullable = true, Length = 12)]
+    public string IssueType { get; set; }
+
+    /// <summary>
+    /// 签单日期
+    /// </summary>
+    [SugarColumn(ColumnDescription = "签单日期", IsNullable = true)]
+    public DateTime? IssueDate { get; set; }
+
+    /// <summary>
+    /// 签单地点Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "签单地点Id", IsNullable = true, DefaultValue = "0")]
+    public long IssuePlaceId { get; set; }
+
+    /// <summary>
+    /// 签单地点
+    /// </summary>
+    [SugarColumn(ColumnDescription = "签单地点", IsNullable = true, Length = 60)]
+    public string IssuePlace { get; set; }
+
+    /// <summary>
+    /// 签单状态
+    /// </summary>
+    [SugarColumn(ColumnDescription = "签单状态", IsNullable = true)]
+    public DateTime? BLIssueSatus { get; set; }
+
+    /// <summary>
+    /// 付款地点Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "付款地点Id", IsNullable = true, DefaultValue = "0")]
+    public long PrepareAtId { get; set; }
+
+    /// <summary>
+    /// 预付地点
+    /// </summary>
+    [SugarColumn(ColumnDescription = "预付地点", IsNullable = true, Length = 50)]
+    public string PrepareAt { get; set; }
+
+    /// <summary>
+    /// 预付地点
+    /// </summary>
+    [SugarColumn(ColumnDescription = "预付地点", IsNullable = true, Length = 50)]
+    public string PayableAt { get; set; }
+
+    /// <summary>
+    /// 运输条款    CY-CY    t_code_service
+    /// </summary>
+    [SugarColumn(ColumnDescription = "运输条款", IsNullable = true, Length = 50)]
+    public string Service { get; set; }
+
+    /// <summary>
+    /// 唛头    N/M
+    /// </summary>
+    [SugarColumn(ColumnDescription = "唛头", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string Marks { get; set; }
+
+
+    /// <summary>
+    /// 箱号封号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "箱号封号", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string CntrSealNo { get; set; }
+
+    /// <summary>
+    /// 件数包装
+    /// </summary>
+    [SugarColumn(ColumnDescription = "件数包装", IsNullable = true, Length = 120)]
+    public string NoPkgs { get; set; }
+
+    /// <summary>
+    /// 货物描述
+    /// </summary>
+    [SugarColumn(ColumnDescription = "货物描述", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string Description { get; set; }
+
+    /// <summary>
+    /// 品名    t_code_goods
+    /// </summary>
+    [SugarColumn(ColumnDescription = "品名", IsNullable = true, Length = 30)]
+    public string GoodsName { get; set; }
+
+    /// <summary>
+    /// 货物毛重
+    /// </summary>
+    [SugarColumn(ColumnDescription = "货物毛重", IsNullable = true, Length = 600)]
+    public string GrossWeight { get; set; }
+
+    /// <summary>
+    /// 货物尺码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "货物尺码", IsNullable = true, Length = 600)]
+    public string Measurement { get; set; }
+
+    /// <summary>
+    /// 件数
+    /// </summary>
+    [SugarColumn(ColumnDescription = "件数", IsNullable = true)]
+    public int? PKGS { get; set; }
+
+    /// <summary>
+    /// 包装    t_code_package
+    /// </summary>
+    [SugarColumn(ColumnDescription = "包装", IsNullable = true, Length = 20)]
+    public string KindPkgs { get; set; }
+
+    /// <summary>
+    /// 毛重
+    /// </summary>
+    [SugarColumn(ColumnDescription = "毛重", IsNullable = true, Length = 18, DecimalDigits = 4, DefaultValue = "0")]
+    public decimal? KGS { get; set; }
+
+    /// <summary>
+    /// 尺码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "尺码", IsNullable = true, Length = 18, DecimalDigits = 4, DefaultValue = "0")]
+    public decimal? CBM { get; set; }
+
+    /// <summary>
+    /// 件数大写
+    /// </summary>
+    [SugarColumn(ColumnDescription = "件数大写", IsNullable = true, Length = 100)]
+    public string TotalNo { get; set; }
+
+    /// <summary>
+    /// 集装箱大写
+    /// </summary>
+    [SugarColumn(ColumnDescription = "集装箱大写", IsNullable = true, Length = 1000)]
+    public string CntrNo { get; set; }
+
+
+    /// <summary>
+    /// Desc:MBL付费方式    t_code_frt
+    /// </summary>
+    [SugarColumn(ColumnDescription = "MBL付费方式", IsNullable = true, Length = 20)]
+    public string MBLFrt { get; set; }
+
+
+    /// <summary>
+    /// Desc:备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// Desc:其他备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "其他备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string OrderContent { get; set; }
+}

ds-wms-service/DS.WMS.MainApi/Controllers/FormCopyController.cs

@@ -52,13 +52,13 @@ public class FormCopyController : ApiController
     /// <summary>
     /// 详情
     /// </summary>
-    /// <param name="permissionId">权限Id</param>
+    /// <param name="id">Id</param>
     /// <returns></returns>
     [HttpGet]
     [Route("GetFormCopyInfo")]
-    public DataResult<CodeFormCopyRes> GetFormCopyInfo([FromQuery] string permissionId)
+    public DataResult<CodeFormCopyRes> GetFormCopyInfo([FromQuery] string id)
     {
-        var res = _invokeService.GetFormCopyInfo(permissionId);
+        var res = _invokeService.GetFormCopyInfo(id);
         return res;
     }
 }