18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-25 11:52:39 +08:00
parent de6998c6b9 8ebefb2050
commit 8cc20cf49e
6 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -3671,6 +3671,16 @@
销售订单号
</summary>
</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">
<summary>
发货组织
@@ -3861,6 +3871,16 @@
销售订单号
</summary>
</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">
<summary>
发货组织

10
src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
View File

@@ -51,6 +51,16 @@ namespace WMS.Web.Core.Dto.OutStock
[Column("销售订单号")]
public string SaleBillNo { get; set; }
/// <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>
[Column("发货组织")]

10
src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
View File

@@ -56,6 +56,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
[Column("销售订单号")]
public string SaleBillNo { get; set; }
/// <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>
[Column("发货组织")]

20
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -1204,9 +1204,9 @@ namespace WMS.Web.Domain.Services.Public
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result<string>.ReFailure(msg, 10002);
}
catch (Exception)
catch (Exception ex)
{
return Result<string>.ReFailure("错误", 10002);
return Result.ReFailure(ex.ToString(), 10002);
}
}
/// <summary>
@@ -1236,9 +1236,9 @@ namespace WMS.Web.Domain.Services.Public
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
catch (Exception ex)
{
return Result.ReFailure("错误", 10002);
return Result.ReFailure(ex.ToString(), 10002);
}
}
/// <summary>
@@ -1268,9 +1268,9 @@ namespace WMS.Web.Domain.Services.Public
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
catch (Exception ex)
{
return Result.ReFailure("错误", 10002);
return Result.ReFailure(ex.ToString(), 10002);
}
}
/// <summary>
@@ -1300,9 +1300,9 @@ namespace WMS.Web.Domain.Services.Public
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
catch (Exception ex)
{
return Result.ReFailure("错误", 10002);
return Result.ReFailure(ex.ToString(), 10002);
}
}
/// <summary>
@@ -1332,9 +1332,9 @@ namespace WMS.Web.Domain.Services.Public
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
catch (Exception ex)
{
return Result.ReFailure("错误", 10002);
return Result.ReFailure(ex.ToString(), 10002);
}
}
/// <summary>

9
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -162,8 +162,8 @@ namespace WMS.Web.Repositories
CreateTime = s.order.CreateTime.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
SourceBillNoList = s.detail.ErpDetails.Select(s => s.SourceBillNo).ToList(),
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
ReceiptCustomer = s.order.Type == OutStockType.Sal
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
@@ -177,6 +177,11 @@ namespace WMS.Web.Repositories
#endregion
}).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);
}
/// <summary>

9
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -295,8 +295,8 @@ namespace WMS.Web.Repositories
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
SourceBillNoList = s.detail.ErpDetails.Select(s=>s.SourceBillNo).ToList(),
SaleBillNoList = s.detail.ErpDetails.Select(s => s.SaleBillNo).ToList(),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
ReceiptCustomer = s.order.Type == OutStockType.Sal
? _erpBasicDataExtendService.GetCustomerName(customers, s.order.ReceiptCustomerId)
@@ -308,6 +308,11 @@ namespace WMS.Web.Repositories
#endregion
}).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);
}
/// <summary>