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

改了查询

Browse Source
This commit is contained in:
18923810322
2025-07-24 11:52:36 +08:00
parent 66f2a9b86f
commit 506f653f44
10 changed files with 295 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BarCode.Web.Repositories/SecurityGenerateRecordRepositories.cs
View File

@@ -203,6 +203,11 @@ namespace BarCode.Web.Repositories
|| w.Specifications.Contains(dto.MaterialNumber)
).Select(s => s.MaterialNumber).ToList();
}
List<int> cr_ids = new List<int>();
if (!string.IsNullOrEmpty(dto.CreateUser))
{
cr_ids = await _basicsRepositories.GetUserIdsAsync(dto.CreateUser, loginInfo.UserInfo.CompanyId);
}
List<int> sIds = new List<int>();
if (dto.SecurityNumbers != null && dto.SecurityNumbers.Count() > 0)
{
@@ -210,6 +215,7 @@ namespace BarCode.Web.Repositories
.GroupBy(g => g.GenerateRecordId).Select(s => s.Key).ToListAsync();
}
////供应商
//var supplier_result = await _erpService.BillQueryForSupplier();
//List<ErpSupplierDto> suppliers = new List<ErpSupplierDto>();
@@ -252,6 +258,8 @@ namespace BarCode.Web.Repositories
if (dto.SecurityNumbers != null && dto.SecurityNumbers.Count() > 0)
query = query.Where(w => sIds.Contains(w.Id));
if (!string.IsNullOrEmpty(dto.CreateUser))
query = query.Where(w => cr_ids.Contains(w.CreatorId));
int total = await query.CountAsync();
var list = await query.Select(s => new SecurityGenerateRecordInfoResponse()

81
src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -509,7 +509,7 @@ namespace BarCode.Web.Repositories
IsTwo = s.serial.IsTwo,
SuitNumber=s.serial.SuitNumber,
TwoSerialNumber = s.serial.TwoSerialNumber.Replace(s.serial.SerialNumber, "").Replace(",", "")
}).ToListAsync();
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
List<SerialNumberInfoResponse2> returnList= new List<SerialNumberInfoResponse2>();
for (int i = 0; i < list.Count; i++)
@@ -635,20 +635,77 @@ namespace BarCode.Web.Repositories
.Where(f => dto.Ids.Contains(f.serial.GenerateRecordId));
int total = await query.CountAsync();
var list = await query.Select(s => new SerialNumbersExportReponse()
if (dto.IsTwo == 2)
{
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
MaterialNumber = s.serial.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode,
Number = s.sg == null ? 0 : s.sg.Number,
SupplierOrOrg = string.IsNullOrEmpty(s.sg.SupplierCode) ? _erpBasicDataExtendService.GetOrgName(orgs, s.sg.OrgCode)
: _erpBasicDataExtendService.GetSupplierName(suppliers, s.sg.SupplierCode)
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
List<SerialNumbersExportReponse2> returnList = new List<SerialNumbersExportReponse2>();
var list = await query.Select(s => new SerialNumbersExportReponse2()
{
PurchaseBillNo = s.sg == null ? "" : s.sg.PurchaseBillNo,
SuitNumber=s.serial.SuitNumber,
TwoSerialNumber=s.serial.TwoSerialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
MaterialNumber = s.serial.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode,
Number = s.sg == null ? 0 : s.sg.Number,
SupplierOrOrg = string.IsNullOrEmpty(s.sg.SupplierCode) ? _erpBasicDataExtendService.GetOrgName(orgs, s.sg.OrgCode)
: _erpBasicDataExtendService.GetSupplierName(suppliers, s.sg.SupplierCode)
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
for (int i = 0; i < list.Count; i++)
{
SerialNumbersExportReponse2 list2 = new SerialNumbersExportReponse2();
if (list[i] != null)
{
if (list[i].SuitNumber == list[i].SerialNumber)
{
List<string> sn = new List<string>();
sn.Add(list[i].TwoSerialNumber.Replace(list[i].SuitNumber, "").Replace(",", ""));
var serialNumbers = await GetEntityList(sn);
list2.PurchaseBillNo = list[i].PurchaseBillNo;
list2.Specifications = list[i].Specifications;
list2.MaterialNumber = list[i].MaterialNumber;
list2.MaterialName = list[i].MaterialName;
list2.BarCode = list[i].BarCode;
list2.SerialNumber = list[i].SerialNumber;
list2.SerialNumber2 = serialNumbers[0].SerialNumber;
list2.NumberCode = list[i].NumberCode;
list2.NumberCode2 = serialNumbers[0].NumberCode;
list2.Number = list[i].Number;
list2.SupplierOrOrg = list[i].SupplierOrOrg;
returnList.Add(list2);
}
}
}
return (returnList, total);
}
else
{
var list = await query.Select(s => new SerialNumbersExportReponse()
{
PurchaseBillNo= s.sg == null ? "" : s.sg.PurchaseBillNo,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
MaterialNumber = s.serial.MaterialNumber,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode,
Number = s.sg == null ? 0 : s.sg.Number,
SupplierOrOrg = string.IsNullOrEmpty(s.sg.SupplierCode) ? _erpBasicDataExtendService.GetOrgName(orgs, s.sg.OrgCode)
: _erpBasicDataExtendService.GetSupplierName(suppliers, s.sg.SupplierCode)
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
}
/// <summary>
/// 根据箱Id来搜索序列号
/// </summary>