修复bug
This commit is contained in:
@@ -3666,6 +3666,16 @@
|
|||||||
销售订单号
|
销售订单号
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.SourceBillNoList">
|
||||||
|
<summary>
|
||||||
|
来源单号(集合)
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.SaleBillNoList">
|
||||||
|
<summary>
|
||||||
|
销售订单号(集合)
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.DeliveryOrg">
|
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.DeliveryOrg">
|
||||||
<summary>
|
<summary>
|
||||||
发货组织
|
发货组织
|
||||||
@@ -3856,6 +3866,16 @@
|
|||||||
销售订单号
|
销售订单号
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.SourceBillNoList">
|
||||||
|
<summary>
|
||||||
|
来源单号(集合)
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.SaleBillNoList">
|
||||||
|
<summary>
|
||||||
|
销售订单号(集合)
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.DeliveryOrg">
|
<member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.DeliveryOrg">
|
||||||
<summary>
|
<summary>
|
||||||
发货组织
|
发货组织
|
||||||
|
|||||||
@@ -51,6 +51,16 @@ namespace WMS.Web.Core.Dto.OutStock
|
|||||||
[Column("销售订单号")]
|
[Column("销售订单号")]
|
||||||
public string SaleBillNo { get; set; }
|
public string SaleBillNo { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 来源单号(集合)
|
||||||
|
///</summary>
|
||||||
|
[Ignore]
|
||||||
|
public List<string> SourceBillNoList { get; set; } = new List<string>();
|
||||||
|
/// <summary>
|
||||||
|
/// 销售订单号(集合)
|
||||||
|
///</summary>
|
||||||
|
[Ignore]
|
||||||
|
public List<string> SaleBillNoList { get; set; } = new List<string>();
|
||||||
|
/// <summary>
|
||||||
/// 发货组织
|
/// 发货组织
|
||||||
///</summary>
|
///</summary>
|
||||||
[Column("发货组织")]
|
[Column("发货组织")]
|
||||||
|
|||||||
@@ -56,6 +56,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
|
|||||||
[Column("销售订单号")]
|
[Column("销售订单号")]
|
||||||
public string SaleBillNo { get; set; }
|
public string SaleBillNo { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 来源单号(集合)
|
||||||
|
///</summary>
|
||||||
|
[Ignore]
|
||||||
|
public List<string> SourceBillNoList { get; set; } = new List<string>();
|
||||||
|
/// <summary>
|
||||||
|
/// 销售订单号(集合)
|
||||||
|
///</summary>
|
||||||
|
[Ignore]
|
||||||
|
public List<string> SaleBillNoList { get; set; } = new List<string>();
|
||||||
|
/// <summary>
|
||||||
/// 发货组织
|
/// 发货组织
|
||||||
///</summary>
|
///</summary>
|
||||||
[Column("发货组织")]
|
[Column("发货组织")]
|
||||||
|
|||||||
@@ -162,8 +162,8 @@ namespace WMS.Web.Repositories
|
|||||||
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
||||||
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
|
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
|
||||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
|
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
|
||||||
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo).Distinct()),
|
SourceBillNoList = s.detail.ErpDetails.Select(s => s.SourceBillNo).ToList(),
|
||||||
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo).Distinct()),
|
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
|
||||||
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
||||||
ReceiptCustomer = s.order.Type == OutStockType.Sal
|
ReceiptCustomer = s.order.Type == OutStockType.Sal
|
||||||
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
|
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
|
||||||
@@ -177,6 +177,11 @@ namespace WMS.Web.Repositories
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||||
|
foreach (var l in list)
|
||||||
|
{
|
||||||
|
l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
|
||||||
|
l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
|
||||||
|
}
|
||||||
return (list, total);
|
return (list, total);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -295,8 +295,8 @@ namespace WMS.Web.Repositories
|
|||||||
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
|
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
|
||||||
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
|
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
|
||||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
|
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
|
||||||
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo).Distinct()),
|
SourceBillNoList = s.detail.ErpDetails.Select(s=>s.SourceBillNo).ToList(),
|
||||||
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo).Distinct()),
|
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
|
||||||
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
|
||||||
ReceiptCustomer = s.order.Type == OutStockType.Sal
|
ReceiptCustomer = s.order.Type == OutStockType.Sal
|
||||||
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
|
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
|
||||||
@@ -308,6 +308,11 @@ namespace WMS.Web.Repositories
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||||
|
foreach(var l in list)
|
||||||
|
{
|
||||||
|
l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
|
||||||
|
l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
|
||||||
|
}
|
||||||
return (list, total);
|
return (list, total);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user