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

调整序列码状态

Browse Source
This commit is contained in:
18942506660
2024-04-09 15:01:47 +08:00
parent dfe652edc0
commit 55721d7630
8 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -224,7 +224,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, bool IsIncludeDelete = false)
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -249,12 +249,19 @@ namespace WMS.Web.Repositories
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.Where(w => serialNumber.Equals(w.serial.SerialNumber));
if (IsIncludeDelete == false) res = res.Where(w => w.serial.IsDelete != true);
//0:所有 1 非激活的或者(激活被冻结) 2 激活被冻结 3 激活非冻结
if (serialStatus == 1)
res = res.Where(w => w.serial.IsActivate != true || (w.serial.IsActivate == true && w.serial.IsDelete == true));
else if (serialStatus == 2)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete == true);
else if (serialStatus == 3)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete != true);
var entity = await res.FirstOrDefaultAsync();
if (entity == null || entity.serial == null)
{
if (IsOps)
return await GetSerialNumber_Ops(serialNumber, IsIncludeDelete);
return await GetSerialNumber_Ops(serialNumber, serialStatus);
else
return null;
}
@@ -279,7 +286,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
private async Task<MaterialResponse> GetSerialNumber_Ops(string serialNumber, bool IsIncludeDelete = false)
private async Task<MaterialResponse> GetSerialNumber_Ops(string serialNumber, int serialStatus = 0)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -293,7 +300,13 @@ namespace WMS.Web.Repositories
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.Where(w => serialNumber.Equals(w.serial.SerialNumber));
if (IsIncludeDelete == false) res = res.Where(w => w.serial.IsDelete != true);
//0:所有 1 非激活的或者(激活被冻结) 2 激活被冻结 3 激活非冻结
if (serialStatus == 1)
res = res.Where(w => w.serial.IsActivate != true || (w.serial.IsActivate == true && w.serial.IsDelete == true));
else if (serialStatus == 2)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete == true);
else if (serialStatus == 3)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete != true);
var entity = await res.FirstOrDefaultAsync();
if (entity == null) return null;
response.IsOldOps = true;