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-11 14:36:17 +08:00
parent 2523517dcc
commit 05aa8ce1f6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -272,8 +272,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? ""; response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? ""; response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber; response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete; response.IsDelete = entity.serial.IsDelete ?? false;
response.IsActivate = entity.serial.IsActivate; response.IsActivate = entity.serial.IsActivate ?? false;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber; response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
@@ -320,8 +320,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? ""; response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? ""; response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber; response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete; response.IsDelete = entity.serial.IsDelete ?? false;
response.IsActivate = entity.serial.IsActivate; response.IsActivate = entity.serial.IsActivate ?? false;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber; response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);