diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 8be9635e..e2cf03ae 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1564,6 +1564,14 @@
+
+
+ 获取供应商名称
+
+
+
+
+
erp:单据查询-采购入库单
@@ -2397,6 +2405,14 @@
+
+
+ 获取供应商名称
+
+
+
+
+
erp数据交互服务
diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
index 8a896b8c..185bde2d 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
@@ -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
///
///
string GetOrgName(List erpOrgs, int orgId);
+
+ ///
+ /// 获取供应商名称
+ ///
+ ///
+ ///
+ ///
+ string GetSupplierName(List erpSuppliers, int supplierId);
}
}
diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
index 9758a53e..45dca39f 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
@@ -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;
}
+
+ ///
+ /// 获取供应商名称
+ ///
+ ///
+ ///
+ ///
+ public string GetSupplierName(List erpSuppliers, int supplierId)
+ {
+ var supplier = erpSuppliers.Where(x => x.Id == supplierId).FirstOrDefault();
+ return supplier == null ? "" : supplier.Name;
+ }
}
}
diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs
index 07ea268c..cc04ea9c 100644
--- a/src/WMS.Web.Repositories/InStockRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockRepositories.cs
@@ -55,7 +55,7 @@ namespace WMS.Web.Repositories
///
public async Task> GetPagedList(InStockQueryRequest dto)
{
- //1.获取物料集合和组织集合
+ //1.获取物料集合和组织集合和供应商的集合
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return ResultPagedList.ReFailure(materials_result);
@@ -67,6 +67,12 @@ namespace WMS.Web.Repositories
return ResultPagedList.ReFailure(orgs_result);
var orgs = orgs_result.Data.ToList();
+ //供应商集合
+ var suppliers_result = await _erpService.BillQueryForSupplier();
+ if (!suppliers_result.IsSuccess)
+ return ResultPagedList.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),
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index afc69540..1c13feeb 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -71,6 +71,12 @@ namespace WMS.Web.Repositories
return ResultPagedList.ReFailure(orgs_result);
var orgs = orgs_result.Data.ToList();
+ //供应商集合
+ var suppliers_result = await _erpService.BillQueryForSupplier();
+ if (!suppliers_result.IsSuccess)
+ return ResultPagedList.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),