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

11
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -510,6 +510,17 @@ namespace WMS.Web.Api.Controllers
_logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode} 是否Ops:{IsOps} 查询状态 {serialStatus}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus ?? 0);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
/*
以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
不存在的序列号提示：产品信息不存在
非采购上架 改箱 (非激活的或者(激活被冻结)) 1
出库回退上架 (激活被冻结) 2
*/
if (serialStatus == 1 || serialStatus == 2)
{
if (res.IsDelete != true)
return Result<MaterialResponse>.ReFailure(ResultCodes.SerialNumbersIsShelf);
}
_logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");
return Result<MaterialResponse>.ReSuccess(res);

10
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -4419,6 +4419,16 @@
是否是老Ops条码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.IsDelete">
<summary>
是否冻结
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.IsActivate">
<summary>
是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.MaterialSubStock">
<summary>
物料对应的仓位有哪些

8
src/WMS.Web.Core/Dto/MaterialResponse.cs
View File

@@ -53,5 +53,13 @@ namespace WMS.Web.Core.Dto
/// 是否是老Ops条码
/// </summary>
public bool IsOldOps { get; set; } = false;
/// <summary>
/// 是否冻结
///</summary>
public bool? IsDelete { get; set; } = false;
/// <summary>
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///</summary>
public bool? IsActivate { get; set; } = false;
}
}

1
src/WMS.Web.Domain/Values/ResultCodes.cs
View File

@@ -87,6 +87,7 @@ namespace WMS.Web.Domain.Values
public static ValueTuple<int, string> TakeStockStockError = (610001, "一次不能盘多个仓库");
public static ValueTuple<int, string> TakeStockErpSubStockError = (610005, "HD或GD仓时子仓库必填");
public static ValueTuple<int, string> TakeStockBoxError = (610004, "一次只能盘一个箱");
public static ValueTuple<int, string> SerialNumbersIsShelf = (610006, "序列号已上架入库");
public static ValueTuple<int, string> SubscribeNotificationNoData = (700001, "订阅通知信息不存在");
}

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);