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 b07d3479..490a255c 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -375,7 +375,7 @@ public partial class SeaExportService : ISeaExportService }; var res = new SeaExportListRes() { - List = list, + List = data.Data, TotalCount = list.Count(), DataTotal = totalData }; diff --git a/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs b/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs index 7de0f25a..f0197cbc 100644 --- a/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs +++ b/ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs @@ -21,39 +21,39 @@ namespace DS.WMS.Core.Op.View /// 单据类型 /// public int BusinessType { get; set; } - /// - /// 单据类型 - /// - public int BusinessTypeName { get; set; } + ///// + ///// 单据类型 + ///// + //public int BusinessTypeName { get; set; } /// /// 业务状态 /// public int BusinessStatus { get; set; } = 0; - /// - /// 业务状态名称 - /// - public string BusinessStatusName { get; set; } - /// - /// 整单费用状态 - /// - public BillAuditStatus BillFeeStatus { get; set; } = 0; - - /// - /// 整单费用状态时间 - /// - public DateTime? BillFeeStatusTime { get; set; } + ///// + ///// 业务状态名称 + ///// + //public string BusinessStatusName { get; set; } + ///// + ///// 整单费用状态 + ///// + //public BillAuditStatus BillFeeStatus { get; set; } = 0; + + ///// + ///// 整单费用状态时间 + ///// + //public DateTime? BillFeeStatusTime { get; set; } - /// - /// 录入日期 - /// - public DateTime BusinessDate { get; set; } = DateTime.Now; + ///// + ///// 录入日期 + ///// + //public DateTime BusinessDate { get; set; } = DateTime.Now; - /// - /// 财务日期 - /// - public string AccountDate { get; set; } + ///// + ///// 财务日期 + ///// + //public string AccountDate { get; set; } /// /// 主提单号 @@ -165,15 +165,15 @@ namespace DS.WMS.Core.Op.View public string DischargePort { get; set; } - /// - /// 交货地代码 - /// - public long DeliveryPlaceId { get; set; } + ///// + ///// 交货地代码 + ///// + //public long DeliveryPlaceId { get; set; } - /// - /// 交货地 - /// - public string DeliveryPlace { get; set; } + ///// + ///// 交货地 + ///// + //public string DeliveryPlace { get; set; } /// /// 目的地代码 @@ -205,10 +205,10 @@ namespace DS.WMS.Core.Op.View - /// - /// 货物描述 - /// - public string Description { get; set; } + ///// + ///// 货物描述 + ///// + //public string Description { get; set; } /// /// 品名 t_code_goods @@ -236,62 +236,7 @@ namespace DS.WMS.Core.Op.View /// public decimal? CBM { get; set; } - - /// - /// 箱型1 - /// - public int Cntr1 { get; set; } - - /// - /// 箱型2 - /// - public int Cntr2 { get; set; } - - /// - /// 箱型3 - /// - public int Cntr3 { get; set; } - - /// - /// 箱型4 - /// - public int Cntr4 { get; set; } - - /// - /// 箱型5 - /// - public int Cntr5 { get; set; } - - /// - /// 箱型6 - /// - public int Cntr6 { get; set; } - - /// - /// 箱型7 - /// - public int Cntr7 { get; set; } - - /// - /// 箱型8 - /// - public int Cntr8 { get; set; } - - /// - /// 箱型9 - /// - public int Cntr9 { get; set; } - - /// - /// 箱型10 - /// - public int Cntr10 { get; set; } - - /// - /// 其他箱型 - /// - public int OtherCntr { get; set; } - + /// /// 箱TEU /// @@ -354,14 +299,14 @@ namespace DS.WMS.Core.Op.View /// public string Forwarder { get; set; } - /// - /// 报关行Id - /// - public long CustomserId { get; set; } - /// - /// 报关行 - /// - public string Customser { get; set; } + ///// + ///// 报关行Id + ///// + //public long CustomserId { get; set; } + ///// + ///// 报关行 + ///// + //public string Customser { get; set; } /// /// 承运车队Id @@ -388,20 +333,20 @@ namespace DS.WMS.Core.Op.View /// public string DangerClass { get; set; } - /// - /// 危险品编号 - /// - public string DangerNo { get; set; } + ///// + ///// 危险品编号 + ///// + //public string DangerNo { get; set; } - /// - /// 危险品页号 - /// - public string DangerPage { get; set; } + ///// + ///// 危险品页号 + ///// + //public string DangerPage { get; set; } - /// - /// 危险品标签 - /// - public string DangerLabel { get; set; } + ///// + ///// 危险品标签 + ///// + //public string DangerLabel { get; set; } /// @@ -414,10 +359,10 @@ namespace DS.WMS.Core.Op.View /// public long SourceDetailId { get; set; } - /// - /// Desc:业务来源明细名称 - /// - public string SourceDetailName { get; set; } + ///// + ///// Desc:业务来源明细名称 + ///// + //public string SourceDetailName { get; set; } /// /// Desc:报关票数 /// @@ -466,10 +411,10 @@ namespace DS.WMS.Core.Op.View /// public DateTime CloseDocDate { get; set; } - /// - /// 集港日期 - /// - public DateTime IntoPortDocDate { get; set; } + ///// + ///// 集港日期 + ///// + //public DateTime IntoPortDocDate { get; set; } /// /// Desc:所属业务部门 @@ -497,30 +442,8 @@ namespace DS.WMS.Core.Op.View /// /// Desc:订舱编号 /// - public string OrderNo { get; set; } - - /// - /// Desc:操作员代码 - /// - public string OperatorCode { get; set; } - - - - - /// - /// Desc:操作员传真 - /// - public string OperatorFax { get; set; } - + public string OrderNo { get; set; } - - /// - /// Desc:业务来源代码 - /// - public string SourceCode { get; set; } - - - /// /// Desc:服务合同号 /// @@ -537,10 +460,10 @@ namespace DS.WMS.Core.Op.View /// public string CustomNo { get; set; } - /// - /// Desc: 报关日期 - /// - public DateTime CustomDate { get; set; } + ///// + ///// Desc: 报关日期 + ///// + //public DateTime CustomDate { get; set; } /// @@ -589,12 +512,7 @@ namespace DS.WMS.Core.Op.View /// public long SaleOrgId { get; set; } - - - /// - /// 备注 - /// - public string Note { get; set; } = ""; + /// @@ -602,22 +520,12 @@ namespace DS.WMS.Core.Op.View /// public DateTime CreateTime { get; set; } + - /// - /// Desc:提单签发状态 - /// - public int BLIssueStatus { get; set; } - - /// - /// Desc:整票提交状态 - /// - public AuditStatusEnum BillSubmitStatus { get; set; } - - - /// - /// 发货人 t_info_client CUSTNAME - /// - public string Shipper { get; set; } + ///// + ///// 发货人 t_info_client CUSTNAME + ///// + //public string Shipper { get; set; } /// /// 销售人 ///