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

修改了物料规格

Browse Source
This commit is contained in:
18923810322
2026-03-13 10:56:58 +08:00
parent 402da31758
commit 6c43101804
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5115,6 +5115,11 @@
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.BarCode">
<summary>
条码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.IsOldOps">
<summary>
是否是老Ops条码

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

@@ -49,6 +49,12 @@ namespace WMS.Web.Core.Dto
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 条码
/// </summary>
public string BarCode { get; set; }
/// <summary>
/// 是否是老Ops条码
/// </summary>

4
src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
View File

@@ -91,5 +91,9 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("IsActivate")]
public bool? IsActivate { get; set; } = false;
}
}

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

@@ -311,9 +311,11 @@ namespace WMS.Web.Repositories
response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete ?? false;
response.IsActivate = entity.serial.IsActivate ?? false;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName)? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber): entity.serial.MaterialName;
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications)?_erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber): entity.serial.Specifications;
response.BarCode= string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode;
if (entity.boxInventory != null)
response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
response.IsTwo = entity.serial.IsTwo;
@@ -389,6 +391,13 @@ namespace WMS.Web.Repositories
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
//response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName) ? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber) : entity.serial.MaterialName;
//response.MaterialNumber = entity.serial.MaterialNumber;
//response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications) ? _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber) : entity.serial.Specifications;
//response.BarCode = string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode;
//if (entity.boxInventory != null)
// response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;