自动对账修改

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
         };

ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs

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