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-10 17:30:09 +08:00
parent 9551c59446
commit 4405f7e41d
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,10 +250,11 @@ namespace WMS.Web.Repositories
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.Where(w => serialNumber.Equals(w.serial.SerialNumber));
//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);
//因为要 1和2的情况 要区分提示 所以条件扩大 然后根据具体的情况提示
//if (serialStatus == 1)
// res = res.Where(w => w.serial.IsActivate != true || (w.serial.IsActivate == true && w.serial.IsDelete == true));
if (serialStatus == 2)
res = res.Where(w => w.serial.IsActivate == true);
else if (serialStatus == 3)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete != true);
@@ -271,6 +272,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete;
response.IsActivate = entity.serial.IsActivate;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
@@ -301,10 +304,11 @@ namespace WMS.Web.Repositories
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })
.Where(w => serialNumber.Equals(w.serial.SerialNumber));
//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);
//因为要 1和2的情况 要区分提示 所以条件扩大 然后根据具体的情况提示
//if (serialStatus == 1)
// res = res.Where(w => w.serial.IsActivate != true || (w.serial.IsActivate == true && w.serial.IsDelete == true));
if (serialStatus == 2)
res = res.Where(w => w.serial.IsActivate == true);
else if (serialStatus == 3)
res = res.Where(w => w.serial.IsActivate == true && w.serial.IsDelete != true);
var entity = await res.FirstOrDefaultAsync();
@@ -316,6 +320,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete;
response.IsActivate = entity.serial.IsActivate;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);