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

供应商信息应用上

Browse Source
This commit is contained in:
tongfei
2023-11-08 14:18:59 +08:00
parent 333f0a0c10
commit a6fbdaae02
5 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1564,6 +1564,14 @@
<param name="orgId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetSupplierName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Supplier.ErpSupplierDto},System.Int32)">
<summary>
获取供应商名称
</summary>
<param name="erpSuppliers"></param>
<param name="supplierId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock">
<summary>
erp:单据查询-采购入库单
@@ -2397,6 +2405,14 @@
<param name="orgId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetSupplierName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Supplier.ErpSupplierDto},System.Int32)">
<summary>
获取供应商名称
</summary>
<param name="erpSuppliers"></param>
<param name="supplierId"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.Public.ErpService">
<summary>
erp数据交互服务

9
src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Erp.Supplier;
namespace WMS.Web.Domain.IService.Public
{
@@ -49,5 +50,13 @@ namespace WMS.Web.Domain.IService.Public
/// <param name="orgId"></param>
/// <returns></returns>
string GetOrgName(List<ErpOrgDto> erpOrgs, int orgId);
/// <summary>
/// 获取供应商名称
/// </summary>
/// <param name="erpSuppliers"></param>
/// <param name="supplierId"></param>
/// <returns></returns>
string GetSupplierName(List<ErpSupplierDto> erpSuppliers, int supplierId);
}
}

13
src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using System.Text;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Erp.Supplier;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
@@ -87,5 +88,17 @@ namespace WMS.Web.Domain.Services.Public
var org = erpOrgs.Where(x => x.Id == orgId).FirstOrDefault();
return org == null ? "" : org.Name;
}
/// <summary>
/// 获取供应商名称
/// </summary>
/// <param name="erpSuppliers"></param>
/// <param name="supplierId"></param>
/// <returns></returns>
public string GetSupplierName(List<ErpSupplierDto> erpSuppliers, int supplierId)
{
var supplier = erpSuppliers.Where(x => x.Id == supplierId).FirstOrDefault();
return supplier == null ? "" : supplier.Name;
}
}
}

12
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -55,7 +55,7 @@ namespace WMS.Web.Repositories
/// <returns></returns>
public async Task<ResultPagedList<InStockQueryResponse>> GetPagedList(InStockQueryRequest dto)
{
//1.获取物料集合和组织集合
//1.获取物料集合和组织集合和供应商的集合
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return ResultPagedList<InStockQueryResponse>.ReFailure(materials_result);
@@ -67,6 +67,12 @@ namespace WMS.Web.Repositories
return ResultPagedList<InStockQueryResponse>.ReFailure(orgs_result);
var orgs = orgs_result.Data.ToList();
//供应商集合
var suppliers_result = await _erpService.BillQueryForSupplier();
if (!suppliers_result.IsSuccess)
return ResultPagedList<InStockQueryResponse>.ReFailure(suppliers_result);
var suppliers = suppliers_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
@@ -114,8 +120,8 @@ namespace WMS.Web.Repositories
BillNo=s.order.BillNo,
Type=s.order.Type.GetRemark(),
SourceBillNo=s.detail.SourceBillNo,
Supplier="",
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
Supplier= _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),

8
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -71,6 +71,12 @@ namespace WMS.Web.Repositories
return ResultPagedList<InStockTaskQueryResponse>.ReFailure(orgs_result);
var orgs = orgs_result.Data.ToList();
//供应商集合
var suppliers_result = await _erpService.BillQueryForSupplier();
if (!suppliers_result.IsSuccess)
return ResultPagedList<InStockTaskQueryResponse>.ReFailure(suppliers_result);
var suppliers = suppliers_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
@@ -123,7 +129,7 @@ namespace WMS.Web.Repositories
Type = s.order.Type.GetRemark(),
Status = s.order.Status.GetRemark(),
SourceBillNo = s.order.SourceBillNo,
Supplier = "",
Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
Org = _erpBasicDataExtendService.GetOrgName(orgs,s.detail.OrgId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials,s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),