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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-01-03 10:55:55 +08:00
parent 60889fcca3
commit 6450473daf
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs
View File

@@ -26,12 +26,16 @@ namespace WMS.Web.Core.Dto.TakeStock
/// </summary> /// </summary>
public int? SuccessSync { get; set; } public int? SuccessSync { get; set; }
/// <summary> /// <summary>
/// 物料编码
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 盘点日期-开始 /// 盘点日期-开始
/// </summary> /// </summary>
public DateTime? DateBeginDate { get; set; } = null; public DateTime? CreateBeginDate { get; set; } = null;
/// <summary> /// <summary>
/// 盘点日期-结束 /// 盘点日期-结束
/// </summary> /// </summary>
public DateTime? DateEndDate { get; set; } = null; public DateTime? CreateEndDate { get; set; } = null;
} }
} }

17
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -196,10 +196,17 @@ namespace WMS.Web.Repositories
if (companyId == 0) if (companyId == 0)
companyId = _loginRepositories.CompanyId; companyId = _loginRepositories.CompanyId;
//1.获取物料集合 //1.获取物料集合
List<int> mIds = new List<int>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
List<ErpMaterialDto> materials = new List<ErpMaterialDto>(); List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
if (materials_result.IsSuccess) if (materials_result.IsSuccess)
materials = materials_result.Data.ToList(); materials = materials_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
if (materials != null)
mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
}
//金蝶子仓库 //金蝶子仓库
var subStock_result = await _erpService.BillQueryForSubStock(); var subStock_result = await _erpService.BillQueryForSubStock();
List<Erp_SubStockDto> subStocks = new List<Erp_SubStockDto>(); List<Erp_SubStockDto> subStocks = new List<Erp_SubStockDto>();
@@ -212,6 +219,8 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.detail.Id) .OrderByDescending(o => o.detail.Id)
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => mIds.Contains(w.detail.MaterialId));
if (dto.ResultType != null) if (dto.ResultType != null)
query = query.Where(w => w.order.ResultType == (TakeStockType)dto.ResultType); query = query.Where(w => w.order.ResultType == (TakeStockType)dto.ResultType);
if (!string.IsNullOrEmpty(dto.BillNo)) if (!string.IsNullOrEmpty(dto.BillNo))
@@ -232,10 +241,10 @@ namespace WMS.Web.Repositories
|| w.order.SuccessSync == SyncStatus.SubmitFail || w.order.SuccessSync == SyncStatus.SubmitFail
|| w.order.SuccessSync == SyncStatus.CheckFail); || w.order.SuccessSync == SyncStatus.CheckFail);
} }
if (dto.DateBeginDate != null) if (dto.CreateBeginDate != null)
query = query.Where(w => w.order.Date >= dto.DateBeginDate); query = query.Where(w => w.order.Date >= dto.CreateBeginDate);
if (dto.DateEndDate != null) if (dto.CreateEndDate != null)
query = query.Where(w => w.order.Date <= dto.DateEndDate); query = query.Where(w => w.order.Date <= dto.CreateEndDate);
//组装 //组装
int total = await query.CountAsync(); int total = await query.CountAsync();
var list = await query.Select(s => new TakeStockQueryInfoResponse() var list = await query.Select(s => new TakeStockQueryInfoResponse()