大改了序列号的返回

This commit is contained in:
2025-05-13 09:02:27 +08:00
parent 93d38924be
commit c609fb7327
8 changed files with 52 additions and 40 deletions

View File

@@ -258,12 +258,16 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
public async Task<List<MaterialResponse>> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
{
List<MaterialResponse> response2 = new List<MaterialResponse>();
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return response;
{
response2.Add(response);
return response2;
}
var materials = materials_result.Data.ToList();
var m = materials.Where(f => (f.Specifications.Equals(serialNumber) || f.MaterialNumber.Equals(serialNumber)));
@@ -275,7 +279,8 @@ namespace WMS.Web.Repositories
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, material.MaterialNumber);
response.MaterialNumber = material.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, material.MaterialNumber);
return response;
response2.Add(response);
return response2;
}
var res = _context.SerialNumbers
.GroupJoin(_context.BoxInventory.Include(x => x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory })
@@ -325,8 +330,8 @@ namespace WMS.Web.Repositories
response.IsNotCount = "0";
}
response.IsNotCount = entity.serial.IsNotCount;
return response;
response2.Add(response);
return response2;
}
/// <summary>
@@ -334,12 +339,16 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
private async Task<MaterialResponse> GetSerialNumber_Ops(string serialNumber, int serialStatus = 0)
private async Task<List<MaterialResponse>> GetSerialNumber_Ops(string serialNumber, int serialStatus = 0)
{
List<MaterialResponse> response2 = new List<MaterialResponse>();
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return response;
{
response2.Add(response);
return response2;
}
var materials = materials_result.Data.ToList();
var res = _context.SerialNumbers_Ops
@@ -373,8 +382,8 @@ namespace WMS.Web.Repositories
//if (entity.boxInventory != null)
// response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
return response;
response2.Add(response);
return response2;
}
/// <summary>
/// 老ops条码批量修改