diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/OpBusinessLogRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/OpBusinessLogRes.cs index c0bceb84..5f4dec3b 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/OpBusinessLogRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/OpBusinessLogRes.cs @@ -1,4 +1,5 @@ -using SqlSugar; +using DS.WMS.Core.Op.Entity; +using SqlSugar; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,6 +11,10 @@ namespace DS.WMS.Core.Op.Dtos { public class OpBusinessLogRes { + /// + /// 详情 + /// + public List Details { get; set; } /// /// 主键Id /// @@ -23,18 +28,18 @@ namespace DS.WMS.Core.Op.Dtos /// public string OperateType { get; set; } - /// - /// 旧值 - /// - public string OldValue { get; set; } - /// - /// 新值 - /// - public string NewValue { get; set; } - /// - /// 差异数据 - /// - public string DiffData { get; set; } + ///// + ///// 旧值 + ///// + //public string OldValue { get; set; } + ///// + ///// 新值 + ///// + //public string NewValue { get; set; } + ///// + ///// 差异数据 + ///// + //public string DiffData { get; set; } /// /// 业务来源代码 diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs index dea1c5a5..7393746b 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs @@ -803,7 +803,7 @@ public class SeaExportReq /// /// Desc:清关日期 /// - public DateTime ClearCustomDate { get; set; } + public DateTime? ClearCustomDate { get; set; } /// /// Desc:报检项目 @@ -916,7 +916,7 @@ public class SeaExportReq /// 交货日期 /// - public DateTime DeliveryDate { get; set; } + public DateTime? DeliveryDate { get; set; } /// /// 场站联系人 diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLog.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLog.cs index fc7ed2fc..3aa26c49 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLog.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLog.cs @@ -25,21 +25,21 @@ namespace DS.WMS.Core.Op.Entity [SugarColumn(ColumnDescription = "操作方式：新增(Create)、更新(Update)、删除(Delete) ",IsNullable = false,Length =20)] public string OperateType { get; set; } - /// - /// 旧值 - /// - [SugarColumn(ColumnDescription = "旧值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] - public string OldValue { get; set; } - /// - /// 新值 - /// - [SugarColumn(ColumnDescription = "新值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] - public string NewValue { get; set; } - /// - /// 差异数据 - /// - [SugarColumn(ColumnDescription = "差异数据", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] - public string DiffData { get; set; } + ///// + ///// 旧值 + ///// + //[SugarColumn(ColumnDescription = "旧值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + //public string OldValue { get; set; } + ///// + ///// 新值 + ///// + //[SugarColumn(ColumnDescription = "新值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + //public string NewValue { get; set; } + ///// + ///// 差异数据 + ///// + //[SugarColumn(ColumnDescription = "差异数据", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + //public string DiffData { get; set; } /// /// 业务来源代码 diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLogDetail.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLogDetail.cs new file mode 100644 index 00000000..1e3a8251 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/OpBusinessLogDetail.cs @@ -0,0 +1,45 @@ +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 +{ + /// + /// 业务日志明细 + /// + [SqlSugar.SugarTable("op_business_log_detail", "业务日志明细")] + public class OpBusinessLogDetail + { + /// + /// ID + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + /// + /// 上级id + /// + [SugarColumn(ColumnDescription = "上级id")] + public long? Pid { get; set; } + /// + /// 字段 + /// + + [SugarColumn(ColumnDescription = "字段", IsNullable = true, Length = 100)] + public string FieldValue { get; set; } + /// + /// 旧值 + /// + [SugarColumn(ColumnDescription = "旧值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + public string OldValue { get; set; } + /// + /// 新值 + /// + [SugarColumn(ColumnDescription = "新值", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + public string NewValue { get; set; } + + } +} diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs index 6fa7790f..7819041a 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs @@ -10,21 +10,24 @@ namespace DS.WMS.Core.Op.Entity; /// [SqlSugar.SugarTable("op_sea_export", "海运出口表")] public class SeaExport : BaseOrgModel -{ +{ /// /// 主单Id /// + [Description("主单Id")] [SqlSugar.SugarColumn(ColumnDescription = "主单Id", IsNullable = false,DefaultValue = "0")] - public long ParentId { get; set; } + public long ParentId { get; set; } /// /// 业务状态 /// + [Description("业务状态")] [SqlSugar.SugarColumn(ColumnDescription = "业务状态", IsNullable = false, DefaultValue = "0")] public int BusinessStatus { get; set; } /// /// 业务状态名称 /// + [Description("业务状态名称")] [SqlSugar.SugarColumn(ColumnDescription = "业务状态名称", IsNullable = true, Length = 50)] public string BusinessStatusName { get; set; } /// @@ -36,247 +39,291 @@ public class SeaExport : BaseOrgModel /// Desc:是否费用锁定 /// [SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")] - public bool? IsFeeLocking { get; set; } = false; + public bool? IsFeeLocking { get; set; } = false; /// /// 财务日期 /// + [Description("财务日期")] [SqlSugar.SugarColumn(ColumnDescription = "财务日期", IsNullable = false,Length = 7)] public string AccountDate { get; set; } /// /// 主提单号 /// + [Description("主提单号")] [SqlSugar.SugarColumn(ColumnDescription = "主提单号", IsNullable = true, Length = 30)] public string MBLNO { get; set; } /// /// 分提单号 /// + [Description("分提单号")] [SqlSugar.SugarColumn(ColumnDescription = "分提单号", IsNullable = true, Length = 30)] public string HBLNO { get; set; } /// /// 委托编号 可以根据规则生成 /// + [Description("委托编号")] [SqlSugar.SugarColumn(ColumnDescription = "委托编号", IsNullable = true, Length = 30)] public string CustomerNo { get; set; } /// /// 运单号 可以根据规则生成 /// + [Description("运单号")] [SqlSugar.SugarColumn(ColumnDescription = "运单号", IsNullable = true, Length = 30)] public string TransNo { get; set; } /// /// 委托单位Id /// + [Description("委托单位Id")] [SqlSugar.SugarColumn(ColumnDescription = "委托单位Id", IsNullable = false, DefaultValue = "0")] public long CustomerId { get; set; } /// /// 委托单位 t_info_client CUSTNAME /// + [Description("委托单位")] [SqlSugar.SugarColumn(ColumnDescription = "委托单位", IsNullable = true, Length = 50)] public string CustomerName { get; set; } /// /// 装运方式 整箱、拼箱单票、拼箱主票、拼箱分票 /// + [Description("装运方式")] [SqlSugar.SugarColumn(ColumnDescription = "装运方式", IsNullable = false, Length = 30)] public string BLType { get; set; } /// /// 发货人 t_info_client CUSTNAME /// + [Description("发货人Id")] [SqlSugar.SugarColumn(ColumnDescription = "发货人", IsNullable = true)] public long? ShipperId { get; set; } /// /// 发货人 t_info_client CUSTNAME /// + [Description("发货人")] [SqlSugar.SugarColumn(ColumnDescription = "发货人", IsNullable = true, Length = 100)] public string Shipper { get; set; } /// /// 客户编号 /// + [Description("客户编号")] [SqlSugar.SugarColumn(ColumnDescription = "客户编号", IsNullable = true, Length = 50)] public string CustomerNum { get; set; } /// /// 国内发货人 t_info_client CUSTNAME /// + [Description("国内发货人Id")] [SqlSugar.SugarColumn(ColumnDescription = "发货人Id", IsNullable = true)] public long? ShipperCnId { get; set; } /// /// 国内发货人 t_info_client CUSTNAME /// + [Description("国内发货人")] [SqlSugar.SugarColumn(ColumnDescription = "国内发货人", IsNullable = true, Length = 100)] public string ShipperCn { get; set; } /// /// 收货人 t_info_client CUSTNAME /// + [Description("收货人Id")] [SqlSugar.SugarColumn(ColumnDescription = "收货人", IsNullable = true)] public long? ConsigneeId { get; set; } /// /// 收货人 t_info_client CUSTNAME /// + [Description("收货人")] [SqlSugar.SugarColumn(ColumnDescription = "收货人", IsNullable = true, Length = 100)] public string Consignee { get; set; } /// /// 通知人 t_info_client CUSTNAME /// + [Description("通知人Id")] [SqlSugar.SugarColumn(ColumnDescription = "通知人", IsNullable = true)] public long? NotifyPartyId { get; set; } /// /// 通知人 t_info_client CUSTNAME /// + [Description("通知人")] [SqlSugar.SugarColumn(ColumnDescription = "通知人", IsNullable = true, Length = 100)] public string NotifyParty { get; set; } /// /// 国外代理人Id t_info_client CUSTNAME /// + [Description("国外代理人Id")] [SqlSugar.SugarColumn(ColumnDescription = "国外代理人Id", IsNullable = true)] public long AgentId { get; set; } /// /// 国外代理人 t_info_client CUSTNAME /// + [Description("国外代理人")] [SqlSugar.SugarColumn(ColumnDescription = "国外代理人", IsNullable = true, Length = 100)] public string Agent { get; set; } /// /// 发货人内容 /// + [Description("发货人内容")] [SqlSugar.SugarColumn(ColumnDescription = "发货人内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string ShipperContent { get; set; } /// /// 收货人内容 /// + [Description("收货人内容")] [SqlSugar.SugarColumn(ColumnDescription = "收货人内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string ConsigneeContent { get; set; } /// /// 通知人内容 /// + [Description("通知人内容")] [SqlSugar.SugarColumn(ColumnDescription = "通知人内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string NotifyPartyContent { get; set; } /// /// 国外代理内容 /// + [Description("国外代理内容")] [SqlSugar.SugarColumn(ColumnDescription = "国外代理内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string AgentContent { get; set; } /// /// 场站Id t_crm_client CUSTNAME /// + [Description("场站Id")] [SqlSugar.SugarColumn(ColumnDescription = "场站Id", IsNullable = true, DefaultValue ="0")] public long YardId { get; set; } /// /// 场站 t_crm_client CUSTNAME /// + [Description("场站")] [SqlSugar.SugarColumn(ColumnDescription = "场站", IsNullable = true, Length = 100)] public string Yard { get; set; } /// /// 场站备注 /// + [Description("场站备注")] [SqlSugar.SugarColumn(ColumnDescription = "场站备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string YardRemark { get; set; } /// /// 船名 t_code_vessel /// + [Description("船名")] [SqlSugar.SugarColumn(ColumnDescription = "船名", IsNullable = true, Length = 60)] public string Vessel { get; set; } /// /// 船名Id t_code_vessel /// + [Description("船名Id")] [SqlSugar.SugarColumn(ColumnDescription = "船名Id", IsNullable = true, DefaultValue = "0")] public long VesselId { get; set; } /// /// 海关航次 /// + [Description("海关航次")] [SqlSugar.SugarColumn(ColumnDescription = "海关航次", IsNullable = true, Length = 20)] public string Voyno { get; set; } /// /// 内部航次 /// + [Description("内部航次")] [SqlSugar.SugarColumn(ColumnDescription = "内部航次", IsNullable = true, Length = 20)] public string InnerVoyno { get; set; } /// /// 第二通知人Id t_info_client CUSTNAME /// + [Description("第二通知人Id")] [SqlSugar.SugarColumn(ColumnDescription = "第二通知人Id", IsNullable = true)] public long? SecondNotifyPartyId { get; set; } /// /// 第二通知人 t_info_client CUSTNAME /// + [Description("第二通知人")] [SqlSugar.SugarColumn(ColumnDescription = "第二通知人", IsNullable = true,Length = 100)] public string SecondNotifyParty { get; set; } /// /// 第二通知人内容 /// + [Description("第二通知人内容")] [SqlSugar.SugarColumn(ColumnDescription = "第二通知人内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string SecondNotifyPartyContent { get; set; } /// /// 开船日期 /// + [Description("开船日期")] [SugarColumn(ColumnDescription = "开船日期", IsNullable = true)] public DateTime? ETD { get; set; } /// /// 预抵日期 /// + [Description("预抵日期")] [SugarColumn(ColumnDescription = "预抵日期", IsNullable = true)] public DateTime? ETA { get; set; } /// /// ATD 实际开船时间 /// + [Description("ATD")] [SugarColumn(ColumnDescription = "ATD", IsNullable = true)] public DateTime? ATD { get; set; } /// /// ATA 实际到港(目的港)时间 /// + [Description("ATA")] [SugarColumn(ColumnDescription = "ATA", IsNullable = true)] public DateTime? ATA { get; set; } /// /// 截港日期 /// + [Description("截港日期")] [SugarColumn(ColumnDescription = "截港日期", IsNullable = true)] public DateTime? ClosingDate { get; set; } /// /// 收货地 /// + [Description("收货地")] [SugarColumn(ColumnDescription = "收货地", IsNullable = true, Length = 60)] public string ReceiptPlace { get; set; } /// /// 收货地点Id /// + [Description("收货地点Id")] [SugarColumn(ColumnDescription = "收货地点Id", IsNullable = true, DefaultValue = "0")] public long ReceiptPlaceId { get; set; } /// /// 装货港Id /// + [Description("装货港Id")] [SugarColumn(ColumnDescription = "装货港Id", IsNullable = true)] public long LoadPortId { get; set; } /// /// 装货港 /// + [Description("装货港")] [SugarColumn(ColumnDescription = "装货港", IsNullable = true, Length = 60)] public string LoadPort { get; set; } /// /// 卸货港Id /// + [Description("卸货港Id")] [SugarColumn(ColumnDescription = "卸货港Id", IsNullable = true)] public long DischargePortId { get; set; } /// /// 卸货港 /// + [Description("卸货港")] [SugarColumn(ColumnDescription = "卸货港", IsNullable = true, Length = 60)] public string DischargePort { get; set; } @@ -284,548 +331,641 @@ public class SeaExport : BaseOrgModel /// /// 交货地id /// + [Description("交货地id")] [SugarColumn(ColumnDescription = "交货地id", IsNullable = true)] public long DeliveryPlaceId { get; set; } /// /// 交货地 /// + [Description("交货地")] [SugarColumn(ColumnDescription = "交货地", IsNullable = true, Length = 60)] public string DeliveryPlace { get; set; } /// /// 目的地id /// + [Description("目的地id")] [SugarColumn(ColumnDescription = "目的地id", IsNullable = true)] public long DestinationId { get; set; } /// /// 目的地 /// + [Description("目的地")] [SugarColumn(ColumnDescription = "目的地", IsNullable = true, Length = 60)] public string Destination { get; set; } /// /// 提单份数 /// + [Description("提单份数")] [SugarColumn(ColumnDescription = "提单份数", IsNullable = true, Length = 5)] public string NoBill { get; set; } /// /// 副本份数 /// + [Description("副本份数")] [SugarColumn(ColumnDescription = "副本份数", IsNullable = true, Length = 5)] public string CopyNoBill { get; set; } /// /// 签单方式 t_code_issutype /// + [Description("签单方式")] [SugarColumn(ColumnDescription = "签单方式", IsNullable = true, Length = 12)] public string IssueType { get; set; } /// /// 签单日期 /// + [Description("签单日期")] [SugarColumn(ColumnDescription = "签单日期", IsNullable = true)] public DateTime? IssueDate { get; set; } /// /// 签单地点Id /// + [Description("签单地点Id")] [SugarColumn(ColumnDescription = "签单地点Id", IsNullable = true, DefaultValue = "0")] public long IssuePlaceId { get; set; } /// /// 签单地点 /// + [Description("签单地点")] [SugarColumn(ColumnDescription = "签单地点", IsNullable = true, Length = 60)] public string IssuePlace { get; set; } /// /// 签单状态 /// + [Description("签单状态")] [SugarColumn(ColumnDescription = "签单状态", IsNullable = true)] public DateTime? BLIssueSatus { get; set; } /// /// 付款地点Id /// + [Description("付款地点Id")] [SugarColumn(ColumnDescription = "付款地点Id", IsNullable = true, DefaultValue = "0")] public long PrepareAtId { get; set; } /// /// 预付地点 /// + [Description("预付地点")] [SugarColumn(ColumnDescription = "预付地点", IsNullable = true, Length = 50)] public string PrepareAt { get; set; } /// /// 预付地点Id /// + [Description("预付地点Id")] [SugarColumn(ColumnDescription = "预付地点Id", IsNullable = true, DefaultValue = "0")] public long PayableAtId { get; set; } /// /// 预付地点 /// + [Description("预付地点")] [SugarColumn(ColumnDescription = "预付地点", IsNullable = true, Length = 50)] public string PayableAt { get; set; } /// /// 第三付款地Id /// + [Description("第三付款地Id")] [SugarColumn(ColumnDescription = "第三付款地Id", IsNullable = true, DefaultValue = "0")] public long ThirdPayAtId { get; set; } /// /// 第三付款地 /// + [Description("第三付款地")] [SugarColumn(ColumnDescription = "第三付款地", IsNullable = true, Length = 50)] public string ThirdPayAt { get; set; } /// /// 运输条款 CY-CY t_code_service /// + [Description("运输条款")] [SugarColumn(ColumnDescription = "运输条款", IsNullable = true, Length = 50)] public string Service { get; set; } /// /// 唛头 N/M /// + [Description("唛头")] [SugarColumn(ColumnDescription = "唛头", IsNullable = true, ColumnDataType=StaticConfig.CodeFirst_BigString)] public string Marks { get; set; } /// /// 箱号封号 /// + [Description("箱号封号")] [SugarColumn(ColumnDescription = "箱号封号", IsNullable = true, ColumnDataType=StaticConfig.CodeFirst_BigString)] public string CntrSealNo { get; set; } /// /// 件数包装 /// + [Description("件数包装")] [SugarColumn(ColumnDescription = "件数包装", IsNullable = true, Length = 120)] public string NoPkgs { get; set; } /// /// 货物描述 /// + [Description("货物描述")] [SugarColumn(ColumnDescription = "货物描述", IsNullable = true, ColumnDataType=StaticConfig.CodeFirst_BigString)] public string Description { get; set; } /// /// 品名Id /// + [Description("品名Id")] [SugarColumn(ColumnDescription = "品名", IsNullable = true, DefaultValue ="0")] public long? GoodsId { get; set; } /// /// 品名 t_code_goods /// + [Description("品名")] [SugarColumn(ColumnDescription = "品名", IsNullable = true, Length = 30)] public string GoodsName { get; set; } /// /// 货物毛重 /// + [Description("货物毛重")] [SugarColumn(ColumnDescription = "货物毛重", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string GrossWeight { get; set; } /// /// 货物尺码 /// + [Description("货物尺码")] [SugarColumn(ColumnDescription = "货物尺码", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string Measurement { get; set; } /// /// 件数 /// + [Description("件数")] [SugarColumn(ColumnDescription = "件数", IsNullable = true)] public int? PKGS { get; set; } /// /// 包装 t_code_package /// + [Description("包装")] [SugarColumn(ColumnDescription = "包装", IsNullable = true, Length = 20)] public string KindPkgs { get; set; } /// /// 毛重 /// + [Description("毛重")] [SugarColumn(ColumnDescription = "毛重", IsNullable = true, Length = 18, DecimalDigits = 4, DefaultValue = "0")] public decimal? KGS { get; set; } /// /// 尺码 /// + [Description("尺码")] [SugarColumn(ColumnDescription = "尺码", IsNullable = true, Length = 18, DecimalDigits = 4, DefaultValue = "0")] public decimal? CBM { get; set; } /// /// 件数大写 /// + [Description("件数大写")] [SugarColumn(ColumnDescription = "件数大写", IsNullable = true, Length = 100)] public string TotalNo { get; set; } /// /// 集装箱大写 /// + [Description("集装箱大写")] [SugarColumn(ColumnDescription = "集装箱大写", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string CntrNo { get; set; } /// /// 箱型1 /// + [Description("箱型1")] [SugarColumn(ColumnDescription = "箱型1", IsNullable = true, DefaultValue = "0")] public int Cntr1 { get; set; } /// /// 箱型2 /// + [Description("箱型2")] [SugarColumn(ColumnDescription = "箱型2", IsNullable = true, DefaultValue = "0")] public int Cntr2 { get; set; } /// /// 箱型3 /// + [Description("箱型3")] [SugarColumn(ColumnDescription = "箱型3", IsNullable = true, DefaultValue = "0")] public int Cntr3 { get; set; } /// /// 箱型4 /// + [Description("箱型4")] [SugarColumn(ColumnDescription = "箱型4", IsNullable = true, DefaultValue = "0")] public int Cntr4 { get; set; } /// /// 箱型5 /// + [Description("箱型5")] [SugarColumn(ColumnDescription = "箱型5", IsNullable = true, DefaultValue = "0")] public int Cntr5 { get; set; } /// /// 箱型6 /// + [Description("箱型6")] [SugarColumn(ColumnDescription = "箱型6", IsNullable = true, DefaultValue = "0")] public int Cntr6 { get; set; } /// /// 箱型7 /// + [Description("箱型7")] [SugarColumn(ColumnDescription = "箱型7", IsNullable = true, DefaultValue = "0")] public int Cntr7 { get; set; } /// /// 箱型8 /// + [Description("箱型8")] [SugarColumn(ColumnDescription = "箱型8", IsNullable = true, DefaultValue = "0")] public int Cntr8 { get; set; } /// /// 箱型9 /// + [Description("箱型9")] [SugarColumn(ColumnDescription = "箱型9", IsNullable = true, DefaultValue = "0")] public int Cntr9 { get; set; } /// /// 箱型10 /// + [Description("箱型10")] [SugarColumn(ColumnDescription = "箱型10", IsNullable = true, DefaultValue = "0")] public int Cntr10 { get; set; } /// /// 其他箱型 /// + [Description("其他箱型")] [SugarColumn(ColumnDescription = "其他箱型", IsNullable = true, DefaultValue = "0")] public int OtherCntr { get; set; } /// /// 箱TEU /// + [Description("箱TEU")] [SugarColumn(ColumnDescription = "箱TEU", IsNullable = true, DefaultValue = "0")] public int TEU { get; set; } /// /// 集装箱 /// + [Description("集装箱")] [SugarColumn(ColumnDescription = "集装箱", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string CntrTotal { get; set; } /// /// 操作员 /// + [Description("操作员Id")] [SugarColumn(ColumnDescription = "操作员", IsNullable = true, DefaultValue = "0")] public long OperatorId { get; set; } /// /// 客服 /// + [Description("客服Id")] [SugarColumn(ColumnDescription = "客服", IsNullable = true, DefaultValue = "0")] public long CustomerService { get; set; } /// /// 外国客服 /// + [Description("外国客服Id")] [SugarColumn(ColumnDescription = "外国客服", IsNullable = true, DefaultValue = "0")] public long ForeignCustomerService { get; set; } /// /// 航线Id /// + [Description("航线Id")] [SugarColumn(ColumnDescription = "航线Id", IsNullable = true, DefaultValue = "0")] public long LaneId { get; set; } /// /// 航线代码 /// + [Description("航线代码")] [SugarColumn(ColumnDescription = "航线代码", IsNullable = true, Length = 100)] public string LaneCode { get; set; } /// /// 航线 /// + [Description("航线")] [SugarColumn(ColumnDescription = "航线", IsNullable = true, Length = 100 )] public string Lane { get; set; } /// /// 揽货人Id /// + [Description("揽货人Id")] [SugarColumn(ColumnDescription = "揽货人Id", IsNullable = true, DefaultValue = "0")] public long SaleId { get; set; } /// /// 揽货人 /// + [Description("揽货人")] [SugarColumn(ColumnDescription = "揽货人", IsNullable = true, Length = 100)] public string Sale { get; set; } /// /// 船公司Id /// + [Description("船公司Id")] [SugarColumn(ColumnDescription = "船公司Id", IsNullable = true, DefaultValue = "0")] public long CarrierId { get; set; } /// /// 船公司 /// + [Description("船公司")] [SugarColumn(ColumnDescription = "船公司", IsNullable = true, Length = 100)] public string Carrier { get; set; } /// /// 货代公司Id /// + [Description("货代公司Id")] [SugarColumn(ColumnDescription = "货代公司Id", IsNullable = true, DefaultValue = "0")] public long ForwarderId { get; set; } /// /// 货代公司 /// + [Description("货代公司")] [SugarColumn(ColumnDescription = "货代公司", IsNullable = true, Length = 100)] public string Forwarder { get; set; } /// /// 报关行Id /// + [Description("报关行Id")] [SugarColumn(ColumnDescription = "报关行Id", IsNullable = true, DefaultValue = "0")] public long CustomserId { get; set; } /// /// 报关行 /// + [Description("报关行")] [SugarColumn(ColumnDescription = "报关行", IsNullable = true, Length = 100)] public string Customser { get; set; } /// /// 承运车队Id /// + [Description("承运车队Id")] [SugarColumn(ColumnDescription = "承运车队Id", IsNullable = true, DefaultValue = "0")] public long TruckerId { get; set; } /// /// 承运车队 /// + [Description("承运车队")] [SugarColumn(ColumnDescription = "承运车队", IsNullable = true, Length = 100)] public string Trucker { get; set; } /// /// 发票号 /// + [Description("发票号")] [SugarColumn(ColumnDescription = "发票号", IsNullable = true, Length = 20)] public string InvoiceNo { get; set; } /// /// 货物标识 S/R/D/O /// + [Description("货物标识")] [SugarColumn(ColumnDescription = "货物标识 S/R/D/O", IsNullable = true, Length = 1)] public string CargoId { get; set; } /// /// 危险品分类 /// + [Description("危险品分类")] [SugarColumn(ColumnDescription = "危险品分类", IsNullable = true, Length = 5)] public string DangerClass { get; set; } /// /// 危险品编号 /// + [Description("危险品编号")] [SugarColumn(ColumnDescription = "危险品编号", IsNullable = true, Length = 16)] public string DangerNo { get; set; } /// /// 危险品页号 /// + [Description("危险品页号")] [SugarColumn(ColumnDescription = "危险品页号", IsNullable = true, Length = 7)] public string DangerPage { get; set; } /// /// 危险品标签 /// + [Description("危险品标签")] [SugarColumn(ColumnDescription = "危险品标签", IsNullable = true, Length = 32)] public string DangerLabel { get; set; } /// /// 冷藏通风量 /// + [Description("冷藏通风量")] [SugarColumn(ColumnDescription = "冷藏通风量", IsNullable = true, Length = 10)] public string ReeferQuantity { get; set; } /// /// 温度单位 /// + [Description("温度单位")] [SugarColumn(ColumnDescription = "温度单位", IsNullable = true, Length = 1)] public string TemperatureUnit { get; set; } /// /// 设置温度 /// + [Description("设置温度")] [SugarColumn(ColumnDescription = "设置温度", IsNullable = true, Length = 5)] public string TemperatureSet { get; set; } /// /// 最低温度 /// + [Description("最低温度")] [SugarColumn(ColumnDescription = "最低温度", IsNullable = true, Length = 5)] public string TemperatureMin { get; set; } /// /// 最高温度 /// + [Description("最高温度")] [SugarColumn(ColumnDescription = "最高温度", IsNullable = true, Length = 5)] public string TemperatureMax { get; set; } /// /// Desc:业务来源Id /// + [Description("业务来源Id")] [SugarColumn(ColumnDescription = "业务来源Id", IsNullable = true, DefaultValue = "0")] public long SourceId { get; set; } /// /// Desc:业务来源明细Id /// + [Description("业务来源明细Id")] [SugarColumn(ColumnDescription = "业务来源明细Id", IsNullable = true, DefaultValue = "0")] public long SourceDetailId { get; set; } /// /// Desc:报关票数 /// + [Description("报关票数")] [SugarColumn(ColumnDescription = "报关票数", IsNullable = true, DefaultValue = "0")] public int CustomsNum { get; set; } /// /// 运费协议号(约号) /// + [Description("运费协议号(约号)")] [SugarColumn(ColumnDescription = "运费协议号(约号)", IsNullable = true, Length = 100)] public string ContractNo { get; set; } - + /// /// 订舱编号 /// + [Description("订舱编号")] [SugarColumn(ColumnDescription = "订舱编号", IsNullable = true, Length = 20)] public string BookingNo { get; set; } /// /// Desc:保险人 /// + [Description("保险人")] [SugarColumn(ColumnDescription = "保险人", IsNullable = true, Length = 30)] public string Insuranceer { get; set; } /// /// Desc:保险单号 /// + [Description("保险单号")] [SugarColumn(ColumnDescription = "保险单号", IsNullable = true, Length = 20)] public string InsuranceNo { get; set; } /// /// Desc:保险金额 /// + [Description("保险金额")] [SugarColumn(ColumnDescription = "保险金额", IsNullable = true, Length = 18, DecimalDigits = 2, DefaultValue = "0")] public decimal? InsuranceAmount { get; set; } /// /// Desc:是否生成凭证 /// + [Description("是否生成凭证")] [SugarColumn(ColumnDescription = "是否生成凭证", DefaultValue = "0")] public bool? IsVoucher { get; set; } = false; /// /// Desc:凭证号 /// + [Description("凭证号")] [SugarColumn(ColumnDescription = "凭证号", IsNullable = true, Length = 20)] public string VoucherNo { get; set; } /// /// Desc:备注 /// + [Description("备注")] [SugarColumn(ColumnDescription = "备注", IsNullable = true, ColumnDataType=StaticConfig.CodeFirst_BigString)] public string Remark { get; set; } - + /// /// Desc:熏蒸 /// + [Description("熏蒸")] [SugarColumn(ColumnDescription = "熏蒸", DefaultValue = "0")] public bool? IsFumigation { get; set; } = false; /// /// Desc:仓储 /// + [Description("仓储")] [SugarColumn(ColumnDescription = "仓储", DefaultValue = "0")] public bool? IsStorage { get; set; } = false; /// /// Desc:陆运 /// + [Description("陆运")] [SugarColumn(ColumnDescription = "陆运", DefaultValue = "0")] public bool? IsLand { get; set; } = false; /// /// Desc:报关 /// + [Description("报关")] [SugarColumn(ColumnDescription = "报关", DefaultValue = "0")] public bool? IsCustoms { get; set; } = false; /// /// Desc:报检 /// + [Description("报检")] [SugarColumn(ColumnDescription = "报检", DefaultValue = "0")] public bool? IsInspection { get; set; } = false; /// /// Desc:订舱 /// + [Description("订舱")] [SugarColumn(ColumnDescription = "订舱", DefaultValue = "0")] public bool? IsBooking { get; set; } = false; /// /// Desc:使用代理 /// + [Description("使用代理")] [SugarColumn(ColumnDescription = "使用代理", DefaultValue = "0")] public bool? IsAgent { get; set; } = false; /// /// Desc:分单签单 /// + [Description("分单签单")] [SugarColumn(ColumnDescription = "分单签单", DefaultValue = "0")] public bool? IsHBLNO { get; set; } = false; /// /// Desc:服务项目9 /// + [Description("服务项目9")] [SugarColumn(ColumnDescription = "服务项目9", DefaultValue = "0")] public bool? Service9 { get; set; } = false; /// /// Desc:服务项目10 /// + [Description("服务项目10")] [SugarColumn(ColumnDescription = "服务项目10", DefaultValue = "0")] public bool? Service10 { get; set; } = false; @@ -833,67 +973,79 @@ public class SeaExport : BaseOrgModel /// /// Desc:单证 /// + [Description("单证Id")] [SugarColumn(ColumnDescription = "单证", IsNullable = true, DefaultValue = "0")] public long Doc { get; set; } /// /// Desc:装箱类型 /// + [Description("装箱类型")] [SugarColumn(ColumnDescription = "装箱类型", IsNullable = true, Length = 10)] public string PackingType { get; set; } /// /// Desc:仓库Id /// + [Description("仓库Id")] [SugarColumn(ColumnDescription = "仓库Id", IsNullable = true,DefaultValue ="0")] public long WareHouseId { get; set; } /// /// Desc:仓库 /// + [Description("仓库")] [SugarColumn(ColumnDescription = "仓库", IsNullable = true, Length = 20)] public string WareHouse { get; set; } /// /// VGM截止日期 /// + [Description("VGM截止日期")] [SqlSugar.SugarColumn(ColumnDescription = "截单日期", IsNullable = true)] public DateTime? CloseVgmDate { get; set; } /// /// 截单日期 /// + [Description("截单日期")] [SqlSugar.SugarColumn(ColumnDescription = "截单日期", IsNullable = true)] public DateTime? CloseDocDate { get; set; } /// /// 截单备注(SI) /// + [Description("截单备注(SI)")] [SqlSugar.SugarColumn(ColumnDescription = "截单备注(SI)", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string CloseDocRemark { get; set; } /// /// 订舱备注 /// + [Description("订舱备注")] [SqlSugar.SugarColumn(ColumnDescription = "订舱备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string BookingRemark { get; set; } /// /// 集港日期 /// + [Description("集港日期")] [SqlSugar.SugarColumn(ColumnDescription = "集港日期", IsNullable = true)] public DateTime? IntoPortDocDate { get; set; } /// /// Desc:所属业务部门 /// + [Description("所属业务部门Id")] [SugarColumn(ColumnDescription = "所属业务部门", IsNullable = true, DefaultValue = "0")] public long SaleDeptId { get; set; } /// /// Desc:MBL付费方式 t_code_frt /// + [Description("MBL付费方式")] [SugarColumn(ColumnDescription = "MBL付费方式", IsNullable = true, Length = 20)] public string MBLFrt { get; set; } /// /// Desc:结算方式 /// + [Description("结算方式")] [SugarColumn(ColumnDescription = "结算方式", IsNullable = true, Length = 30)] public string StlName { get; set; } @@ -901,84 +1053,98 @@ public class SeaExport : BaseOrgModel /// /// Desc:月结算时间 /// + [Description("月结算时间")] [SqlSugar.SugarColumn(ColumnDescription = "月结算时间", IsNullable = true)] public DateTime? StlDate { get; set; } /// /// Desc:委托方式 /// + [Description("委托方式")] [SugarColumn(ColumnDescription = "委托方式", IsNullable = true, Length = 10)] public string OrderType { get; set; } /// /// Desc:订舱编号 /// + [Description("订舱编号")] [SugarColumn(ColumnDescription = "订舱编号", IsNullable = true, Length = 100)] public string OrderNo { get; set; } /// /// Desc:操作员代码 /// + [Description("操作员代码")] [SugarColumn(ColumnDescription = "操作员代码", IsNullable = true, Length = 6)] public string OperatorCode { get; set; } /// /// Desc:是否为操作 /// + [Description("是否为操作")] [SugarColumn(ColumnDescription = "是否为操作", IsNullable = true, DefaultValue = "0")] public bool IsOperator { get; set; } /// /// Desc:操作员邮箱 /// + [Description("操作员邮箱")] [SugarColumn(ColumnDescription = "操作员邮箱", IsNullable = true, Length = 6)] public string OperatorEmail { get; set; } /// /// Desc:操作员电话 /// + [Description("操作员电话")] [SugarColumn(ColumnDescription = "操作员电话", IsNullable = true, Length = 6)] public string OperatorTel { get; set; } /// /// Desc:操作员传真 /// + [Description("操作员传真")] [SugarColumn(ColumnDescription = "操作员传真", IsNullable = true, Length = 6)] public string OperatorFax { get; set; } /// /// Desc:场站自结 /// + [Description("场站自结")] [SugarColumn(ColumnDescription = "场站自结", IsNullable = true, Length = 6)] public string FinancialStaffCode { get; set; } /// /// Desc:是否为财务 /// + [Description("是否为财务")] [SugarColumn(ColumnDescription = "是否为财务", IsNullable = true, DefaultValue = "0")] public bool? IsFinancialStaff { get; set; } = false; /// /// Desc:财务邮箱 /// + [Description("财务邮箱")] [SugarColumn(ColumnDescription = "财务邮箱", IsNullable = true, Length = 6)] public string FinancialStaffEmail { get; set; } /// /// Desc:财务电话 /// + [Description("财务电话")] [SugarColumn(ColumnDescription = "财务电话", IsNullable = true, Length = 6)] public string FinancialStaffTel { get; set; } /// /// Desc:财务传真 /// + [Description("财务传真")] [SugarColumn(ColumnDescription = "财务传真", IsNullable = true, Length = 6)] public string FinancialStaffFax { get; set; } /// /// Desc:业务来源代码 /// + [Description("业务来源代码")] [SugarColumn(ColumnDescription = "业务来源代码", IsNullable = true, Length = 10)] public string SourceCode { get; set; } @@ -986,24 +1152,28 @@ public class SeaExport : BaseOrgModel /// /// Desc:联系人 /// + [Description("联系人")] [SugarColumn(ColumnDescription = "联系人", IsNullable = true, Length = 35)] public string LinkMan { get; set; } /// /// Desc:海关代码 /// + [Description("海关代码")] [SugarColumn(ColumnDescription = "海关代码", IsNullable = true, Length = 20)] public string HSCode { get; set; } /// /// Desc:EDI备注 /// + [Description("EDI备注")] [SugarColumn(ColumnDescription = "EDI备注", IsNullable = true, Length = 300)] public string EdiRemark { get; set; } /// /// Desc:邮件方案 /// + [Description("邮件方案")] [SugarColumn(ColumnDescription = "邮件方案", IsNullable = true, DefaultValue = "0")] public long MailProjectId { get; set; } @@ -1011,18 +1181,21 @@ public class SeaExport : BaseOrgModel /// /// Desc:CSR/IR号 /// + [Description("CSR/IR号")] [SugarColumn(ColumnDescription = "CSR/IR号", IsNullable = true, Length = 20)] public string IRCode { get; set; } /// /// Desc:服务合同号 /// + [Description("服务合同号")] [SugarColumn(ColumnDescription = "服务合同号", IsNullable = true, Length = 30)] public string ServiceContractNo { get; set; } /// /// Desc:申请放箱号 /// + [Description("申请放箱号")] [SugarColumn(ColumnDescription = "申请放箱号", IsNullable = true, Length = 30)] public string ApplyNo { get; set; } @@ -1030,77 +1203,90 @@ public class SeaExport : BaseOrgModel /// /// Desc:报关单号 /// + [Description("报关单号")] [SugarColumn(ColumnDescription = "报关单号", IsNullable = true, Length = 20)] public string CustomNo { get; set; } /// /// Desc: 报关日期 /// + [Description("报关日期")] [SugarColumn(ColumnDescription = "报关日期", IsNullable = true)] public DateTime? CustomDate { get; set; } /// /// 经营单位编码 /// + [Description("经营单位编码")] [SqlSugar.SugarColumn(ColumnDescription = "经营单位编码", IsNullable = true)] public long? EnterpriseId { get; set; } /// /// 经营单位 /// + [Description("经营单位")] [SqlSugar.SugarColumn(ColumnDescription = "经营单位", IsNullable = true, Length = 60)] public string Enterprise { get; set; } /// /// Desc:商检单号 /// + [Description("商检单号")] [SugarColumn(ColumnDescription = "商检单号", Length = 50, IsNullable = true)] public string InspectionNo { get; set; } /// /// Desc:商检日期 /// + [Description("商检日期")] [SugarColumn(ColumnDescription = "商检日期", IsNullable = true)] public DateTime? InspectionDate { get; set; } /// /// Desc:贸易条款 /// + [Description("贸易条款")] [SugarColumn(ColumnDescription = "贸易条款", Length = 20, IsNullable = true)] public string TradeTerm { get; set; } /// /// Desc:贸易方式 /// + [Description("贸易方式")] [SugarColumn(ColumnDescription = "贸易方式", Length = 30, IsNullable = true)] public string TermDelivery { get; set; } /// /// Desc:清关日期 /// + [Description("清关日期")] [SugarColumn(ColumnDescription = "清关日期", IsNullable = true)] public DateTime? ClearCustomDate { get; set; } /// /// Desc:报检项目 /// + [Description("报检项目")] [SugarColumn(ColumnDescription = "报检项目", Length = 20, IsNullable = true)] public string InsperctService { get; set; } /// /// 船代 /// + [Description("船代")] [SqlSugar.SugarColumn(ColumnDescription = "船代", IsNullable = true,Length = 100)] public string ShipAgency { get; set; } /// /// 船代Id /// + [Description("船代Id")] [SqlSugar.SugarColumn(ColumnDescription = "船代Id", IsNullable = true)] public long ShipAgencyId { get; set; } /// /// Desc:湿度 /// + [Description("湿度")] [SugarColumn(ColumnDescription = "湿度", Length = 20, IsNullable = true)] public string Humidity { get; set; } @@ -1108,54 +1294,63 @@ public class SeaExport : BaseOrgModel /// /// Master发货人 /// + [Description("Master发货人")] [SqlSugar.SugarColumn(ColumnDescription = "Master发货人", IsNullable = true)] public long? MasterShipperId { get; set; } /// /// Master收货人 t_info_client CUSTNAME /// + [Description("Master收货人")] [SqlSugar.SugarColumn(ColumnDescription = "Master收货人", IsNullable = true)] public long? MasterConsigneeId { get; set; } /// /// Master通知人 t_info_client CUSTNAME /// + [Description("Master通知人")] [SqlSugar.SugarColumn(ColumnDescription = "Master通知人", IsNullable = true)] public long? MasterNotifyPartyId { get; set; } /// /// Master收货人内容 /// + [Description("Master收货人内容")] [SqlSugar.SugarColumn(ColumnDescription = "Master收货人内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string MasterConsigneeContent { get; set; } /// /// Master通知人内容 /// + [Description("Master通知人内容")] [SqlSugar.SugarColumn(ColumnDescription = "Master通知人内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string MasterNotifyPartyContent { get; set; } /// /// Master发货人内容 /// + [Description("Master发货人内容")] [SqlSugar.SugarColumn(ColumnDescription = "Master发货人内容", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string MasterShipperContent { get; set; } /// /// Master单描述 /// + [Description("Master单描述")] [SqlSugar.SugarColumn(ColumnDescription = "Master单描述", IsNullable = true, Length = 200)] public string MasterDescription { get; set; } /// /// Desc:是否SOC /// + [Description("是否SOC")] [SugarColumn(ColumnDescription = "是否SOC", DefaultValue = "0")] public bool? IsContainerSoc { get; set; } = false; /// /// Desc:运输状态 /// + [Description("运输状态")] [SugarColumn(ColumnDescription = "运输状态", IsNullable = true, Length = 1)] public string TranStatus { get; set; } @@ -1168,76 +1363,89 @@ public class SeaExport : BaseOrgModel /// /// 是否多品名 /// + [Description("是否多品名")] [SugarColumn(ColumnDescription = "是否多品名", DefaultValue = "0")] public bool IsMoreGood { get; set; } /// /// 是否打印小票 /// + [Description("是否打印小票")] [SugarColumn(ColumnDescription = "是否打印小票", DefaultValue = "0")] - public bool IsPrintReceipt { get; set; } + public bool IsPrintReceipt { get; set; } /// /// 船名 t_code_vessel /// + [Description("船名")] [SqlSugar.SugarColumn(ColumnDescription = "船名", IsNullable = true, Length = 60)] public string Vessel2N { get; set; } /// /// 船名Id t_code_vessel /// + [Description("船名Id")] [SqlSugar.SugarColumn(ColumnDescription = "船名Id", IsNullable = true, DefaultValue = "0")] public long VesselId2N { get; set; } /// /// 二程航次 /// + [Description("二程航次")] [SqlSugar.SugarColumn(ColumnDescription = "二程航次", IsNullable = true, Length = 12)] public string Voyno2N { get; set; } /// /// 交货日期 /// + [Description("交货日期")] [SugarColumn(ColumnDescription = "交货日期", IsNullable = true)] public DateTime? DeliveryDate { get; set; } /// /// 场站联系人 /// + [Description("场站联系人")] [SqlSugar.SugarColumn(ColumnDescription = "场站联系人", IsNullable = true, Length = 20)] public string YardATTN { get; set; } /// /// 场站联系方式 /// + [Description("场站联系方式")] [SqlSugar.SugarColumn(ColumnDescription = "场站联系方式", IsNullable = true, Length = 60)] public string YardTel { get; set; } /// /// 销售公司Id /// + [Description("销售公司Id")] [SqlSugar.SugarColumn(ColumnDescription = "销售公司Id", IsNullable = true, DefaultValue = "0")] public long SaleOrgId { get; set; } /// /// 中转港Id /// + [Description("中转港Id")] [SqlSugar.SugarColumn(ColumnDescription = "中转港Id", IsNullable = true, DefaultValue = "0")] public long TransPortId { get; set; } - + /// /// 中转港 /// + [Description("中转港")] [SqlSugar.SugarColumn(ColumnDescription = "中转港", IsNullable = true, Length = 60)] public string TransPort { get; set; } /// /// 转运备注 /// + [Description("转运备注")] [SqlSugar.SugarColumn(ColumnDescription = "转运备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string TransRemark { get; set; } /// /// 预录 /// + [Description("预录")] [SqlSugar.SugarColumn(ColumnDescription = "预录", IsNullable = true, DefaultValue = "0")] public int PreRecord { get; set; } @@ -1263,6 +1471,7 @@ public class SeaExport : BaseOrgModel /// /// Desc:是否改签 /// + [Description("是否改签")] [SugarColumn(ColumnDescription = "是否改签", DefaultValue = "0")] public bool? IsChange { get; set; } = false; @@ -1271,25 +1480,28 @@ public class SeaExport : BaseOrgModel /// [SugarColumn(ColumnDescription = "", IsNullable = true, DefaultValue = "0")] public int WarnCount { get; set; } = 0; - - - - + + + + /// /// Desc:提单签发状态 /// + [Description("提单签发状态")] [SugarColumn(ColumnDescription = "提单签发状态", IsNullable = true, DefaultValue = "0")] public int BLIssueStatus { get; set; } - + /// /// Desc:整票提交状态 /// + [Description("整票提交状态")] [SugarColumn(ColumnDescription = "整票提交状态", IsNullable = true, DefaultValue = "-1")] public AuditStatusEnum BillSubmitStatus { get; set; } /// /// 是否订阅运踪 0 没有订阅 1 订阅起运港 2 订阅目的港 3 订阅起运港目的港 /// + [Description("是否订阅运踪")] [SugarColumn(ColumnDescription = "是否订阅运踪", IsNullable = true, DefaultValue = "0",Length =10)] public string IsBookingYZ { get; set; } @@ -1297,16 +1509,19 @@ public class SeaExport : BaseOrgModel /// /// 委托单位联系人Id /// + [Description("委托单位联系人Id")] [SqlSugar.SugarColumn(ColumnDescription = "委托单位联系人Id", IsNullable = false, DefaultValue = "0")] public long CustomerContactId { get; set; } /// /// 场站联系人Id /// + [Description("场站联系人Id")] [SqlSugar.SugarColumn(ColumnDescription = "场站联系人Id", IsNullable = false, DefaultValue = "0")] public long YardContactId { get; set; } /// /// 车队联系人Id /// + [Description("车队联系人Id")] [SqlSugar.SugarColumn(ColumnDescription = "车队联系人Id", IsNullable = false, DefaultValue = "0")] public long CarrierContactId { get; set; } @@ -1314,6 +1529,7 @@ public class SeaExport : BaseOrgModel /// /// 云港通ETD /// + [Description("云港通ETD")] [SqlSugar.SugarColumn(ColumnDescription = "云港通ETD", IsNullable = true)] public DateTime? YgtETD { get; set; } @@ -1333,51 +1549,60 @@ public class SeaExport : BaseOrgModel /// /// 拆票或合票标志 1-拆票 2-合票 /// + [Description("拆票或合票标志")] [SqlSugar.SugarColumn(ColumnDescription = "拆票或合票标志 1-拆票 2-合票", IsNullable = true,DefaultValue = "0")] public int SplitOrMergeFlag { get; set; } /// /// Desc:单证人员 /// + [Description("单证人员")] [SugarColumn(ColumnDescription = "单证人员", IsNullable = true, Length = 30)] public string DocName { get; set; } /// /// 操作员名称 /// + [Description("操作员名称")] [SugarColumn(ColumnDescription = "操作员", IsNullable = true, Length = 30)] public string OperatorName { get; set; } /// /// 客服名称 /// + [Description("客服名称")] [SugarColumn(ColumnDescription = "客服名称", IsNullable = true,Length = 30)] public string CustomerServiceName { get; set; } /// /// 外国客服名称 /// + [Description("外国客服名称")] [SugarColumn(ColumnDescription = "外国客服名称", IsNullable = true, Length = 30)] public string ForeignCustomerServiceName { get; set; } /// /// 截VGM时间 /// + [Description("截VGM时间")] [SqlSugar.SugarColumn(ColumnDescription = "截VGM时间", IsNullable = true)] public DateTime? VGMCloseDate { get; set; } /// /// 单证备注 /// + [Description("单证备注")] [SugarColumn(ColumnDescription = "单证备注", IsNullable = true, Length = 100)] public string DocRemark { get; set; } /// /// 操作备注 /// + [Description("操作备注")] [SugarColumn(ColumnDescription = "操作备注", IsNullable = true, Length = 100)] public string OperatorRemark { get; set; } /// /// 申请箱使 /// + [Description("申请箱使")] [SugarColumn(ColumnDescription = "申请箱使", IsNullable = true, Length = 100)] public string ApplyCtnRemark { get; set; } @@ -1385,12 +1610,14 @@ public class SeaExport : BaseOrgModel /// /// 装运方式代码 整箱、拼箱单票、拼箱主票、拼箱分票代码 /// + [Description("装运方式代码")] [SqlSugar.SugarColumn(ColumnDescription = "装运方式代码", IsNullable = false, Length = 30)] public string BLTypeCode { get; set; } /// /// Desc:结算方式代码 /// + [Description("结算方式代码")] [SugarColumn(ColumnDescription = "结算方式代码", IsNullable = true, Length = 30)] public string StlCode { get; set; } @@ -1398,150 +1625,175 @@ public class SeaExport : BaseOrgModel /// /// Desc:贸易方式代码 /// + [Description("贸易方式代码")] [SugarColumn(ColumnDescription = "贸易方式代码", Length = 30, IsNullable = true)] public string TermDeliveryCode { get; set; } /// /// Desc:贸易条款代码 /// + [Description("贸易条款代码")] [SugarColumn(ColumnDescription = "贸易条款代码", Length = 30, IsNullable = true)] public string TradeTermCode { get; set; } /// /// 签单方式代码 t_code_issutype /// + [Description("签单方式代码")] [SugarColumn(ColumnDescription = "签单方式代码", IsNullable = true, Length = 30)] public string IssueTypeCode { get; set; } /// /// Desc:MBL付费方式代码 t_code_frt /// + [Description("MBL付费方式代码")] [SugarColumn(ColumnDescription = "MBL付费方式代码", IsNullable = true, Length = 30)] public string MBLFrtCode { get; set; } /// /// 运输条款代码 CY-CY t_code_service /// + [Description("运输条款代码")] [SugarColumn(ColumnDescription = "运输条款代码", IsNullable = true, Length = 30)] public string ServiceCode { get; set; } /// /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常 /// + [Description("最后下货纸比对状态")] [SugarColumn(ColumnDescription = "最后下货纸比对状态", IsNullable = true, Length = 20)] public string LstShipOrderCompareRlt { get; set; } /// /// 最后下货纸比对时间 /// + [Description("最后下货纸比对时间")] [SugarColumn(ColumnDescription = "最后下货纸比对时间", IsNullable = true)] public Nullable LstShipOrderCompareDate { get; set; } /// /// 最后下货纸比对批次号 /// + [Description("最后下货纸比对批次号")] [SugarColumn(ColumnDescription = "最后下货纸比对批次号", IsNullable = true, Length = 64)] public string LstShipOrderCompareId { get; set; } /// /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常 /// + [Description("最后下货纸比对状态")] [SugarColumn(ColumnDescription = "最后下货纸比对状态", IsNullable = true, Length = 30)] public string LstShipOrderCompareRltName { get; set; } /// /// 最后下货纸比对方式 MANUAL-手动 AUTO-自动 /// + [Description("最后下货纸比对方式")] [SugarColumn(ColumnDescription = "最后下货纸比对方式 MANUAL-手动 AUTO-自动", IsNullable = true, Length = 20)] public string LstShipOrderCompareMode { get; set; } /// /// 最后格式单比对状态 NO_DIFF-无异常;DIFF-有差异; /// + [Description("最后格式单比对状态")] [SugarColumn(ColumnDescription = "最后格式单比对状态 NO_DIFF-无异常;DIFF-有差异", IsNullable = true, Length = 20)] public string LstDraftCompareRlt { get; set; } /// /// 最后格式单比对时间 /// + [Description("最后格式单比对时间")] [SugarColumn(ColumnDescription = "最后格式单比对时间", IsNullable = true)] public Nullable LstDraftCompareDate { get; set; } /// /// 中转港代码 /// + [Description("中转港代码")] [SqlSugar.SugarColumn(ColumnDescription = "中转港代码", IsNullable = true, Length = 60)] public string TransPortCode { get; set; } /// /// 收货地代码 /// + [Description("收货地代码")] [SugarColumn(ColumnDescription = "收货地代码", IsNullable = true, Length = 100)] public string ReceiptPlaceCode { get; set; } /// /// 装货港代码 /// + [Description("装货港代码")] [SugarColumn(ColumnDescription = "装货港代码", IsNullable = true, Length = 100)] public string LoadPortCode { get; set; } - + /// /// 卸货港代码 /// + [Description("卸货港代码")] [SugarColumn(ColumnDescription = "卸货港代码", IsNullable = true, Length = 100)] public string DischargePortCode { get; set; } - + /// /// 交货地代码 /// + [Description("交货地代码")] [SugarColumn(ColumnDescription = "交货地代码", IsNullable = true, Length = 100)] public string DeliveryPlaceCode { get; set; } - + /// /// 目的地代码 /// + [Description("目的地代码")] [SugarColumn(ColumnDescription = "目的地代码", IsNullable = true, Length = 100)] public string DestinationCode { get; set; } /// /// 预付地点 /// + [Description("预付地点")] [SugarColumn(ColumnDescription = "预付地点", IsNullable = true, Length = 50)] public string PayableAtCode { get; set; } /// /// 第三付款地代码 /// + [Description("第三付款地代码")] [SugarColumn(ColumnDescription = "第三付款地代码", IsNullable = true, Length = 50)] public string ThirdPayAtCode { get; set; } /// /// 签单地点代码 /// + [Description("签单地点代码")] [SugarColumn(ColumnDescription = "签单地点代码", IsNullable = true, Length = 100)] public string IssuePlaceCode { get; set; } /// /// 所属分部名称 /// + [Description("所属分部名称")] [SqlSugar.SugarColumn(ColumnDescription = "所属分部名称", IsNullable = true, Length = 100)] public string SaleOrgName { get; set; } - + /// /// 订舱类型 /// + [Description("订舱类型")] [SugarColumn(ColumnDescription = "订舱类型", IsNullable = true, Length = 50)] public string BookingType { get; set; } /// /// 舱位类型 /// + [Description("舱位类型")] [SugarColumn(ColumnDescription = "舱位类型", IsNullable = true, Length = 50)] public string ShippingSpaceType { get; set; } /// /// 出单方式 /// + [Description("出单方式")] [SugarColumn(ColumnDescription = "出单方式", IsNullable = true, Length = 50)] public string IssuingWay { get; set; } @@ -1549,42 +1801,49 @@ public class SeaExport : BaseOrgModel /// /// 约主Id /// + [Description("约主Id")] [SugarColumn(ColumnDescription = "约主Id", IsNullable = true, DefaultValue ="0")] public long ContractClientId { get; set; } /// /// 约主名称 /// + [Description("约主名称")] [SugarColumn(ColumnDescription = "约主名称", IsNullable = true, Length = 100)] public string ContractClientName { get; set; } /// /// 包装名称 t_code_package /// + [Description("包装名称")] [SugarColumn(ColumnDescription = "包装名称", IsNullable = true, Length = 50)] public string KindPkgsName { get; set; } /// /// 船司航线 /// + [Description("船司航线")] [SugarColumn(ColumnDescription = "船司航线", IsNullable = true, Length = 100)] public string CarrierLane { get; set; } /// /// SO备注 /// + [Description("SO备注")] [SqlSugar.SugarColumn(ColumnDescription = "SO备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] public string SORemark { get; set; } /// /// 签单要求 /// + [Description("签单要求")] [SugarColumn(ColumnDescription = "签单要求", IsNullable = true, Length = 200)] public string IssueRemark { get; set; } /// /// 开港时间 /// + [Description("开港时间")] [SugarColumn(IsNullable = true, ColumnDescription = "开港时间")] public DateTime? OpenPortDate { get; set; } @@ -1592,11 +1851,13 @@ public class SeaExport : BaseOrgModel /// /// Desc:业务来源名称 /// + [Description("业务来源名称")] [SugarColumn(ColumnDescription = "业务来源名称", Length = 100, IsNullable = true)] public string SourceName { get; set; } /// /// Desc:业务来源明细名称 /// + [Description("业务来源明细名称")] [SugarColumn(ColumnDescription = "业务来源明细名称", Length = 100, IsNullable = true)] public string SourceDetailName { get; set; } @@ -1605,12 +1866,14 @@ public class SeaExport : BaseOrgModel /// /// 航线人员Id /// + [Description("航线人员Id")] [SugarColumn(ColumnDescription = "航线人员Id", IsNullable = true)] public long? LanerId { get; set; } /// /// 航线人员名称 /// + [Description("航线人员名称")] [SugarColumn(ColumnDescription = "航线人员名称", IsNullable = true, Length = 100)] public string Laner { get; set; } @@ -1618,24 +1881,28 @@ public class SeaExport : BaseOrgModel /// /// 所属业务部门名称 /// + [Description("所属业务部门名称")] [SqlSugar.SugarColumn(ColumnDescription = "所属业务部门名称", IsNullable = true, Length = 100)] public string SaleDeptName { get; set; } /// /// 服务项目 /// + [Description("服务项目")] [SugarColumn(ColumnDescription = "服务项目", ColumnDataType = "text", IsNullable = true)] public string? ServiceItem { get; set; } /// /// 订舱方式 /// + [Description("订舱方式")] [SugarColumn(ColumnDescription = "订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", IsNullable = true, Length = 20)] public string BookingSlotType { get; set; } /// /// 订舱方式名称 /// + [Description("订舱方式名称")] [SugarColumn(ColumnDescription = "订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", IsNullable = true, Length = 40)] public string BookingSlotTypeName { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs index 4c193548..8e108a14 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs @@ -57,6 +57,9 @@ using Microsoft.VisualBasic.FileIO; using Microsoft.Extensions.Logging; using AnyDiff.Extensions; using DS.WMS.Core.Sys.Entity; +using LanguageExt; +using Masuit.Tools.Models; +using System.ComponentModel; namespace DS.WMS.Core.Op.Method { @@ -4525,35 +4528,72 @@ namespace DS.WMS.Core.Op.Method { var diff = req.NewOrder.Diff(req.OldOrder); - StringBuilder sb = new StringBuilder(); - foreach (var item in diff) - { - Console.WriteLine($"{item.PropertyType} - {item.Property}: {item.LeftValue} => {item.RightValue}"); - - if (item.LeftValue.IsNotNull() && item.RightValue.IsNotNull()) - { - if (IgnoreColumns.Contains(item.Property)) - continue; - if (!item.LeftValue.Equals(item.RightValue)) - { - sb.Append($"[字段:{item.Property},修改前:{item.LeftValue}，修改后:{item.RightValue}]"); - } - } - } + //StringBuilder sb = new StringBuilder(); + //foreach (var item in diff) + //{ + // Console.WriteLine($"{item.PropertyType} - {item.Property}: {item.LeftValue} => {item.RightValue}"); + + // if (item.LeftValue.IsNotNull() && item.RightValue.IsNotNull()) + // { + // if (IgnoreColumns.Contains(item.Property)) + // continue; + // if (!item.LeftValue.Equals(item.RightValue)) + // { + // sb.Append($"[字段:{item.Property},修改前:{item.LeftValue}，修改后:{item.RightValue}]"); + // } + // } + //} var log = new OpBusinessLog() { BusinessId = req.NewOrder.Id, OperateType = "Update", - OldValue = JsonConvert.SerializeObject(req.OldOrder), - NewValue = JsonConvert.SerializeObject(req.NewOrder), - DiffData = sb.ToString(), + //OldValue = JsonConvert.SerializeObject(req.OldOrder), + //NewValue = JsonConvert.SerializeObject(req.NewOrder), + //DiffData = sb.ToString(), SourceCode = req.SourceCode, SourceName = req.SourceName, }; - await tenantDb.Insertable(log).ExecuteCommandAsync(); + //await tenantDb.Insertable(log).ExecuteCommandAsync(); + var logId = await tenantDb.Insertable(log).ExecuteReturnEntityAsync(); + var detail = new List(); + var list = TypeDescriptor.GetProperties(req.NewOrder); + foreach (PropertyDescriptor descriptor in list) + { + string name = descriptor.Name; + if (IgnoreColumns.Contains(name)) + { + continue; + } + object value = descriptor.GetValue(req.NewOrder); + var oldvalue = req.OldOrder.GetType().GetProperty(name).GetValue(req.OldOrder, null); + + if (name == "KGS" || name == "CBM") + { + if (Convert.ToDecimal(value) == Convert.ToDecimal(oldvalue)) + { + continue; + } + } + string _oldvalue = oldvalue != null ? oldvalue.ToString() : ""; + string _value = value != null ? value.ToString() : ""; + if (_oldvalue != _value && !string.IsNullOrWhiteSpace(descriptor.Description)) + { + detail.Add(new OpBusinessLogDetail() + { + Pid = logId.Id, + OldValue = _oldvalue, + NewValue = _value, + FieldValue = descriptor.Description, + }); + } + } + if (detail.Count > 0) + { + await tenantDb.Insertable(detail).ExecuteCommandAsync(); + } } #endregion } diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs index 90ac8c6d..396cbf28 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportCommonService.cs @@ -30,6 +30,8 @@ using static AnyDiff.DifferenceLines; using Newtonsoft.Json; using Masuit.Tools.Hardware; using DS.Module.Core.Data; +using Masuit.Tools.Models; +using System.ComponentModel; namespace DS.WMS.Core.Op.Method { @@ -79,35 +81,85 @@ namespace DS.WMS.Core.Op.Method { var diff = req.NewOrder.Diff(req.OldOrder); - StringBuilder sb = new StringBuilder(); - foreach (var item in diff) - { - Console.WriteLine($"{item.PropertyType} - {item.Property}: {item.LeftValue} => {item.RightValue}"); - - if (item.LeftValue.IsNotNull() && item.RightValue.IsNotNull()) - { - if (IgnoreColumns.Contains(item.Property)) - continue; - if (!item.LeftValue.Equals(item.RightValue)) - { - sb.Append($"[字段:{item.Property},修改前:{item.LeftValue}，修改后:{item.RightValue}]"); - } - } - } - + var log = new OpBusinessLog() { BusinessId = req.NewOrder.Id, OperateType = "Update", - OldValue = JsonConvert.SerializeObject(req.OldOrder), - NewValue = JsonConvert.SerializeObject(req.NewOrder), - DiffData = sb.ToString(), SourceCode = req.SourceCode, SourceName = req.SourceName, }; + var logId = await tenantDb.Insertable(log).ExecuteReturnEntityAsync(); + var detail = new List(); + var list = TypeDescriptor.GetProperties(req.NewOrder); + //foreach (var item in diff) + //{ + // Console.WriteLine($"{item.PropertyType} - {item.Property}: {item.LeftValue} => {item.RightValue}"); + + // if (!item.LeftValue.Equals(item.RightValue)) + // { + // if (IgnoreColumns.Contains(item.Property)) + // continue; + // var des = string.Empty; + + // foreach (PropertyDescriptor descriptor in list) + // { + // string name = descriptor.Name; + + // if (!name.Equals(item.Property)) + // { + // continue; + // } + // else + // { + // des = string.IsNullOrEmpty(descriptor.Description)? item.Property : descriptor.Description; + // } + // } + // detail.Add(new OpBusinessLogDetail() + // { + // Pid = logId.Id, + // OldValue = item.LeftValue.ToString(), + // NewValue = item.RightValue.ToString(), + // FieldValue = des, + // }); + + // } + //} + foreach (PropertyDescriptor descriptor in list) + { + string name = descriptor.Name; + if (IgnoreColumns.Contains(name)) + { + continue; + } + object value = descriptor.GetValue(req.NewOrder); + var oldvalue = req.OldOrder.GetType().GetProperty(name).GetValue(req.OldOrder, null); + + if (name == "KGS" || name == "CBM") + { + if (Convert.ToDecimal(value) == Convert.ToDecimal(oldvalue)) + { + continue; + } + } + string _oldvalue = oldvalue != null ? oldvalue.ToString() : ""; + string _value = value != null ? value.ToString() : ""; + if (_oldvalue != _value && !string.IsNullOrWhiteSpace(descriptor.Description)) + { + detail.Add(new OpBusinessLogDetail() + { + Pid = logId.Id, + OldValue = _oldvalue, + NewValue = _value, + FieldValue = descriptor.Description, + }); - await tenantDb.Insertable(log).ExecuteCommandAsync(); - + } + } + if (detail.Count > 0) + { + await tenantDb.Insertable(detail).ExecuteCommandAsync(); + } } #endregion diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index 5a334206..f100da85 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -314,7 +314,7 @@ public partial class SeaExportService : ISeaExportService catch (Exception ex) { await dbScope.Ado.RollbackTranAsync(); - await ex.LogAsync(tenantDb); + await ex.LogAsync(db); return await Task.FromResult(DataResult.Failed("添加失败!" + ",请联系管理员!")); } } @@ -488,7 +488,7 @@ public partial class SeaExportService : ISeaExportService catch (Exception ex) { await dbScope.Ado.RollbackTranAsync(); - await ex.LogAsync(tenantDb); + await ex.LogAsync(db); return await Task.FromResult(DataResult.Failed("更新失败!" + ",请联系管理员!")); } } @@ -510,16 +510,28 @@ public partial class SeaExportService : ISeaExportService GoodName = seaExport.GoodsName, HSCode = seaExport.HSCode }; + var checkInfo = sqlSugarScope.Queryable().Where(x => x.HSCode == seaExport.HSCode && x.GoodName ==seaExport.GoodsName).First(); + if (checkInfo.IsNotNull()) + { + return checkInfo.Id; + } + else + { + var entity = sqlSugarScope.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.Goods}{user.TenantId}").ExecuteReturnEntityAsync(); - var entity = sqlSugarScope.Insertable(data).RemoveDataCache($"{SqlSugarCacheConst.Goods}{user.TenantId}").ExecuteReturnEntityAsync(); - - seaExport.GoodsId = entity.Id; - return entity.Id; + seaExport.GoodsId = entity.Id; + return entity.Id; + } + } else { var info = sqlSugarScope.Queryable().Where(x => x.Id == seaExport.GoodsId).First(); + if (info.IsNull()) + { + throw new Exception("商品信息不存在!"); + } info.GoodName = seaExport.GoodsName; info.HSCode = seaExport.HSCode; @@ -742,7 +754,13 @@ public partial class SeaExportService : ISeaExportService //it.FormSetList = tenantDb.Queryable().Where(x => x.PermissionName == "海运出口-详情").Select().ToList(); - it.BusinessLogList = tenantDb.Queryable().Where(x => x.BusinessId == it.Id).Select().ToList(); + it.BusinessLogList = tenantDb.Queryable().Where(x => x.BusinessId == it.Id) + .Select() + .Mapper(a => + { + a.Details = tenantDb.Queryable().Where(x => x.Pid == a.Id).ToList(); + }) + .ToList(); it.OrderContactList = tenantDb.Queryable().Where(x => x.BusinessId == it.Id).Select().ToList(); diff --git a/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs b/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs index 63cfb824..2f9295bd 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs @@ -56,7 +56,7 @@ public interface IUserService /// 查询客户端 用户拥有的菜单权限 /// /// - public Task>> GetClientUserPermissions(); + public Task>> GetClientUserPermissions(string id); /// diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs index d57da245..74be1e21 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs @@ -120,7 +120,7 @@ public class ClientCommonService : IClientCommonService var data = await tenantDb.Queryable() .InnerJoin((a, b) => a.Id == b.ClientId) .Where((a, b) => a.Status == StatusEnum.Enable.ToEnumInt() && b.IsController == true) - .WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey)) + .WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey) || a.Description.Contains(queryKey)) .Select((a, b) => new ControllerClientRes { Id = a.Id, @@ -1219,7 +1219,7 @@ public class ClientCommonService : IClientCommonService .WhereIF(!string.IsNullOrEmpty(code) && code == "shipagency", (a, b) => b.IsShipAgency == true) .WhereIF(!string.IsNullOrEmpty(code) && code == "enterprise", (a, b) => b.IsEnterprise == true) .WhereIF(!string.IsNullOrEmpty(code) && code == "contract", (a, b) => b.IsContract == true) - .WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey)) + .WhereIF(!string.IsNullOrEmpty(queryKey), (a, b) => a.CodeName.Contains(queryKey) || a.ShortName.Contains(queryKey) || a.Description.Contains(queryKey)) .Select((a, b) => new ClientSelectRes { Id = a.Id, diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/SequenceService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/SequenceService.cs index 5d9cb9a0..69cae1b8 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/SequenceService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/SequenceService.cs @@ -25,6 +25,7 @@ public class SequenceService : ISequenceService _serviceProvider = serviceProvider; db = _serviceProvider.GetRequiredService(); user = _serviceProvider.GetRequiredService(); + } /// @@ -52,7 +53,7 @@ public class SequenceService : ISequenceService if (req.Id == 0) { - if (db.Queryable().Where(x => x.PermissionId == req.PermissionId && x.OrderNo == req.OrderNo).Any()) + if (db.Queryable().Where(x => x.PermissionId == req.PermissionId && x.SequenceName == req.SequenceName).Any()) { return DataResult.Failed("系统编码已存在!", MultiLanguageConst.SequenceExist); } diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs index cdddd38f..0a9e7012 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs @@ -279,11 +279,11 @@ public class UserService : IUserService /// 查询客户端 用户拥有的菜单权限 /// /// - public async Task>> GetClientUserPermissions() + public async Task>> GetClientUserPermissions(string id) { List list = new List(); - var userId = long.Parse(user.UserId); + var userId = long.Parse(id); var userInfo = await db.Queryable().Where(x => x.Id == userId).FirstAsync(); diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs index e13fa0b8..14351c69 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs @@ -105,9 +105,9 @@ public class UserController : ApiController /// [HttpGet] [Route("GetClientUserPermissions")] - public async Task>> GetClientUserPermissions() + public async Task>> GetClientUserPermissions([FromQuery] string id) { - var res = await _invokeService.GetClientUserPermissions(); + var res = await _invokeService.GetClientUserPermissions(id); return res; } @@ -118,6 +118,7 @@ public class UserController : ApiController /// [HttpGet] [Route("GetDataRuleListByPermission")] + [Obsolete] public async Task>> GetDataRuleListByPermission([FromQuery] string permissionId) { var res = await _invokeService.GetDataRuleListByPermission(permissionId);