chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自动对账修改

Browse Source
usertest
ZR20090193-陈敬勇 5 months ago
parent 4dbd89a90e
commit 1136d56462
2 changed files with 78 additions and 170 deletions
Show Stats Download Patch File Download Diff File

2
ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
Unescape Escape View File

@ -375,7 +375,7 @@ public partial class SeaExportService : ISeaExportService
}; };
var res = new SeaExportListRes() { var res = new SeaExportListRes() {
List = list, List = data.Data,
TotalCount = list.Count(), TotalCount = list.Count(),
DataTotal = totalData DataTotal = totalData
}; };

236
ds-wms-service/DS.WMS.Core/Op/View/VW_Op_Business.cs
Unescape Escape View File

@ -21,39 +21,39 @@ namespace DS.WMS.Core.Op.View
/// 单据类型 /// 单据类型
/// </summary> /// </summary>
public int BusinessType { get; set; } public int BusinessType { get; set; }
/// <summary> ///// <summary>
/// 单据类型 ///// 单据类型
/// </summary> ///// </summary>
public int BusinessTypeName { get; set; } //public int BusinessTypeName { get; set; }
/// <summary> /// <summary>
/// 业务状态 /// 业务状态
/// </summary> /// </summary>
public int BusinessStatus { get; set; } = 0; public int BusinessStatus { get; set; } = 0;
/// <summary> ///// <summary>
/// 业务状态名称 ///// 业务状态名称
/// </summary> ///// </summary>
public string BusinessStatusName { get; set; } //public string BusinessStatusName { get; set; }
/// <summary> ///// <summary>
/// 整单费用状态 ///// 整单费用状态
/// </summary> ///// </summary>
public BillAuditStatus BillFeeStatus { get; set; } = 0; //public BillAuditStatus BillFeeStatus { get; set; } = 0;
/// <summary> ///// <summary>
/// 整单费用状态时间 ///// 整单费用状态时间
/// </summary> ///// </summary>
public DateTime? BillFeeStatusTime { get; set; } //public DateTime? BillFeeStatusTime { get; set; }
/// <summary> ///// <summary>
/// 录入日期 ///// 录入日期
/// </summary> ///// </summary>
public DateTime BusinessDate { get; set; } = DateTime.Now; //public DateTime BusinessDate { get; set; } = DateTime.Now;
/// <summary> ///// <summary>
/// 财务日期 ///// 财务日期
/// </summary> ///// </summary>
public string AccountDate { get; set; } //public string AccountDate { get; set; }
/// <summary> /// <summary>
/// 主提单号 /// 主提单号
@ -165,15 +165,15 @@ namespace DS.WMS.Core.Op.View
public string DischargePort { get; set; } public string DischargePort { get; set; }
/// <summary> ///// <summary>
/// 交货地代码 ///// 交货地代码
/// </summary> ///// </summary>
public long DeliveryPlaceId { get; set; } //public long DeliveryPlaceId { get; set; }
/// <summary> ///// <summary>
/// 交货地 ///// 交货地
/// </summary> ///// </summary>
public string DeliveryPlace { get; set; } //public string DeliveryPlace { get; set; }
/// <summary> /// <summary>
/// 目的地代码 /// 目的地代码
@ -205,10 +205,10 @@ namespace DS.WMS.Core.Op.View
/// <summary> ///// <summary>
/// 货物描述 ///// 货物描述
/// </summary> ///// </summary>
public string Description { get; set; } //public string Description { get; set; }
/// <summary> /// <summary>
/// 品名 t_code_goods /// 品名 t_code_goods
@ -237,61 +237,6 @@ namespace DS.WMS.Core.Op.View
public decimal? CBM { get; set; } 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> /// <summary>
/// 箱TEU /// 箱TEU
/// </summary> /// </summary>
@ -354,14 +299,14 @@ namespace DS.WMS.Core.Op.View
/// </summary> /// </summary>
public string Forwarder { get; set; } public string Forwarder { get; set; }
/// <summary> ///// <summary>
/// 报关行Id ///// 报关行Id
/// </summary> ///// </summary>
public long CustomserId { get; set; } //public long CustomserId { get; set; }
/// <summary> ///// <summary>
/// 报关行 ///// 报关行
/// </summary> ///// </summary>
public string Customser { get; set; } //public string Customser { get; set; }
/// <summary> /// <summary>
/// 承运车队Id /// 承运车队Id
@ -388,20 +333,20 @@ namespace DS.WMS.Core.Op.View
/// </summary> /// </summary>
public string DangerClass { get; set; } public string DangerClass { get; set; }
/// <summary> ///// <summary>
/// 危险品编号 ///// 危险品编号
/// </summary> ///// </summary>
public string DangerNo { get; set; } //public string DangerNo { get; set; }
/// <summary> ///// <summary>
/// 危险品页号 ///// 危险品页号
/// </summary> ///// </summary>
public string DangerPage { get; set; } //public string DangerPage { get; set; }
/// <summary> ///// <summary>
/// 危险品标签 ///// 危险品标签
/// </summary> ///// </summary>
public string DangerLabel { get; set; } //public string DangerLabel { get; set; }
/// <summary> /// <summary>
@ -414,10 +359,10 @@ namespace DS.WMS.Core.Op.View
/// </summary> /// </summary>
public long SourceDetailId { get; set; } public long SourceDetailId { get; set; }
/// <summary> ///// <summary>
/// Desc:业务来源明细名称 ///// Desc:业务来源明细名称
/// </summary> ///// </summary>
public string SourceDetailName { get; set; } //public string SourceDetailName { get; set; }
/// <summary> /// <summary>
/// Desc:报关票数 /// Desc:报关票数
/// </summary> /// </summary>
@ -466,10 +411,10 @@ namespace DS.WMS.Core.Op.View
/// </summary> /// </summary>
public DateTime CloseDocDate { get; set; } public DateTime CloseDocDate { get; set; }
/// <summary> ///// <summary>
/// 集港日期 ///// 集港日期
/// </summary> ///// </summary>
public DateTime IntoPortDocDate { get; set; } //public DateTime IntoPortDocDate { get; set; }
/// <summary> /// <summary>
/// Desc:所属业务部门 /// Desc:所属业务部门
@ -499,28 +444,6 @@ namespace DS.WMS.Core.Op.View
/// </summary> /// </summary>
public string OrderNo { get; set; } public string OrderNo { get; set; }
/// <summary>
/// Desc:操作员代码
/// </summary>
public string OperatorCode { get; set; }
/// <summary>
/// Desc:操作员传真
/// </summary>
public string OperatorFax { get; set; }
/// <summary>
/// Desc:业务来源代码
/// </summary>
public string SourceCode { get; set; }
/// <summary> /// <summary>
/// Desc:服务合同号 /// Desc:服务合同号
/// </summary> /// </summary>
@ -537,10 +460,10 @@ namespace DS.WMS.Core.Op.View
/// </summary> /// </summary>
public string CustomNo { get; set; } public string CustomNo { get; set; }
/// <summary> ///// <summary>
/// Desc: 报关日期 ///// Desc: 报关日期
/// </summary> ///// </summary>
public DateTime CustomDate { get; set; } //public DateTime CustomDate { get; set; }
/// <summary> /// <summary>
@ -591,11 +514,6 @@ namespace DS.WMS.Core.Op.View
/// <summary>
/// 备注
/// </summary>
public string Note { get; set; } = "";
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
@ -603,21 +521,11 @@ namespace DS.WMS.Core.Op.View
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary>
/// Desc:提单签发状态
/// </summary>
public int BLIssueStatus { get; set; }
/// <summary> ///// <summary>
/// Desc:整票提交状态 ///// 发货人 t_info_client CUSTNAME
/// </summary> ///// </summary>
public AuditStatusEnum BillSubmitStatus { get; set; } //public string Shipper { get; set; }
/// <summary>
/// 发货人 t_info_client CUSTNAME
/// </summary>
public string Shipper { get; set; }
/// <summary> /// <summary>
/// 销售人 /// 销售人
/// </summary> /// </summary>

Write Preview
Loading…
Cancel
Save