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

修改规格查询

Browse Source
This commit is contained in:
18923810322
2026-03-10 14:06:40 +08:00
parent ac3fe2e4f5
commit b6a862ed65
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs
View File

@@ -192,6 +192,8 @@ namespace BarCode.Web.Repositories
int companyId = loginInfo.UserInfo.CompanyId; int companyId = loginInfo.UserInfo.CompanyId;
List<string> mNumber = new List<string>(); List<string> mNumber = new List<string>();
List<string> mSpec = new List<string>();
List<string> mName = new List<string>();
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)
@@ -200,11 +202,22 @@ namespace BarCode.Web.Repositories
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials != null) if (materials != null)
{
mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber) mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber) || w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.MaterialNumber).ToList(); ).Select(s => s.MaterialNumber).ToList();
mSpec = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.Specifications).ToList();
mName = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.MaterialName).ToList();
}
} }
List<int> cr_ids = new List<int>(); List<int> cr_ids = new List<int>();
if (!string.IsNullOrEmpty(dto.CreateUser)) if (!string.IsNullOrEmpty(dto.CreateUser))
{ {
@@ -277,6 +290,11 @@ namespace BarCode.Web.Repositories
} }
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => mNumber.Contains(w.MaterialNumber)); query = query.Where(w => mNumber.Contains(w.MaterialNumber));
if (!string.IsNullOrEmpty(dto.MaterialNumber))
query = query.Where(w => (mSpec.Contains(w.Specifications)|| mName.Contains(w.MaterialName)));
if (dto.CreateBeginDate != null) if (dto.CreateBeginDate != null)
query = query.Where(w => w.GenerateCompleteTime >= dto.CreateBeginDate); query = query.Where(w => w.GenerateCompleteTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null) if (dto.CreateEndDate != null)
@@ -296,6 +314,7 @@ namespace BarCode.Web.Repositories
query = query.Where(w => dto.GenerateComplete == w.IsGenerateComplete); query = query.Where(w => dto.GenerateComplete == w.IsGenerateComplete);
if (!string.IsNullOrEmpty(dto.CreateUser)) if (!string.IsNullOrEmpty(dto.CreateUser))
query = query.Where(w => cr_ids.Contains(w.CreatorId)); query = query.Where(w => cr_ids.Contains(w.CreatorId));
if (dto.IsUpdateMaterial != null) if (dto.IsUpdateMaterial != null)
{ {
if (dto.IsUpdateMaterial == true) if (dto.IsUpdateMaterial == true)