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 12:03:32 +08:00
parent 5bbdb83de0
commit d18bd6cefc
6 changed files with 117 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1548,6 +1548,22 @@
<param name="materialId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialUnitName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
<summary>
获取物料基本单位名称
</summary>
<param name="erpMaterials"></param>
<param name="materialId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
<summary>
获取组织名称
</summary>
<param name="erpOrgs"></param>
<param name="orgId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock">
<summary>
erp:单据查询-采购入库单
@@ -2359,6 +2375,22 @@
<param name="materialId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialUnitName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
<summary>
获取物料基本单位名称
</summary>
<param name="erpMaterials"></param>
<param name="materialId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
<summary>
获取组织名称
</summary>
<param name="erpOrgs"></param>
<param name="orgId"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.Public.ErpService">
<summary>
erp数据交互服务

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

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
namespace WMS.Web.Domain.IService.Public
{
@@ -32,5 +33,21 @@ namespace WMS.Web.Domain.IService.Public
/// <param name="materialId"></param>
/// <returns></returns>
string GetMaterialSpecifications(List<ErpMaterialDto> erpMaterials, int materialId);
/// <summary>
/// 获取物料基本单位名称
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialId"></param>
/// <returns></returns>
string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, int materialId);
/// <summary>
/// 获取组织名称
/// </summary>
/// <param name="erpOrgs"></param>
/// <param name="orgId"></param>
/// <returns></returns>
string GetOrgName(List<ErpOrgDto> erpOrgs, int orgId);
}
}

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

@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
@@ -62,5 +63,29 @@ namespace WMS.Web.Domain.Services.Public
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
return mat == null ? "" : mat.Specifications;
}
/// <summary>
/// 获取物料基本单位名称
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialId"></param>
/// <returns></returns>
public string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, int materialId)
{
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
return mat == null ? "" : mat.BaseUnitName;
}
/// <summary>
/// 获取组织名称
/// </summary>
/// <param name="erpOrgs"></param>
/// <param name="orgId"></param>
/// <returns></returns>
public string GetOrgName(List<ErpOrgDto> erpOrgs, int orgId)
{
var org = erpOrgs.Where(x => x.Id == orgId).FirstOrDefault();
return org == null ? "" : org.Name;
}
}
}

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

@@ -55,12 +55,18 @@ 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);
var materials = materials_result.Data.ToList();
//组织集合
var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess)
return ResultPagedList<InStockQueryResponse>.ReFailure(orgs_result);
var orgs = orgs_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
@@ -109,8 +115,8 @@ namespace WMS.Web.Repositories
Type=s.order.Type.GetRemark(),
SourceBillNo=s.detail.SourceBillNo,
Supplier="",
Org="",
MaterialName= _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
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),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),

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

@@ -60,11 +60,16 @@ namespace WMS.Web.Repositories
/// <returns></returns>
public async Task<ResultPagedList<InStockTaskQueryResponse>> GetPagedList(InStockTaskQueryRequest dto)
{
//1.获取物料集合
//1.获取物料集合和组织集合
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return ResultPagedList<InStockTaskQueryResponse>.ReFailure(materials_result);
var materials = materials_result.Data.ToList();
//组织集合
var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess)
return ResultPagedList<InStockTaskQueryResponse>.ReFailure(orgs_result);
var orgs = orgs_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
@@ -119,7 +124,7 @@ namespace WMS.Web.Repositories
Status = s.order.Status.GetRemark(),
SourceBillNo = s.order.SourceBillNo,
Supplier = "",
Org = "",
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),

35
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -25,19 +25,24 @@ namespace WMS.Web.Repositories
private readonly ILoginRepositories _loginRepositories;
private readonly RepositoryDbContext _context;
private readonly ISingleDataService _singleDataService;
private readonly IErpService _erpService;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
public InventoryDetailsRepositories(RepositoryDbContext context,
IMapper mapper,
IErpService erpService,
ILoginRepositories loginRepositories,
IServiceProvider serviceProvider,
ISingleDataService singleDataService)
ISingleDataService singleDataService,
IErpBasicDataExtendService erpBasicDataExtendService)
{
_context = context;
_mapper = mapper;
_erpService = erpService;
_serviceProvider = serviceProvider;
_loginRepositories = loginRepositories;
_singleDataService = singleDataService;
_erpBasicDataExtendService = erpBasicDataExtendService;
}
/// <summary>
@@ -47,11 +52,25 @@ namespace WMS.Web.Repositories
/// <returns></returns>
public async Task<ResultPagedList<InventoryDetailsQueryResponse>> GetPagedList(InventoryDetailsQueryRequest dto)
{
//1.获取物料集合和组织集合
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return ResultPagedList<InventoryDetailsQueryResponse>.ReFailure(materials_result);
var materials = materials_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
var query = _context.InventoryDetails
.Where(adv => 1 == 1);
//if (!string.IsNullOrEmpty(dto.MaterialNumber))
// query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%"));
//物料ID在模糊后的物料
if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.MaterialId));
}
if (dto.StockId.HasValue)
query = query.Where(w => w.StockId == dto.StockId.Value);
@@ -66,13 +85,13 @@ namespace WMS.Web.Repositories
var list = await query.Select(s => new InventoryDetailsQueryResponse()
{
Id=s.Id,
MaterialName = "",
MaterialNumber = "",
Specifications = "",
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
Stock = "",
Qty = s.Qty,
SubStock ="",
Unit = ""
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
response.Data = list;