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

加了两件装的返回

Browse Source
This commit is contained in:
18923810322
2025-05-07 14:05:28 +08:00
parent 0aad4f32fc
commit 1299af5d54
3 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
View File

@@ -748,6 +748,21 @@
序列号生成用户
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Box.OpsSerialNumbersResponse.IsTwo">
<summary>
是否套装
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Box.OpsSerialNumbersResponse.TwoSerialNumber">
<summary>
第二个序列号
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Box.OpsSerialNumbersResponse.IsNotCount">
<summary>
是否不参与记数
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.Box.OpsBoxDetailsResponse.MaterialNumber">
<summary>
物料编码

17
src/BarCode.Web.Core/Dto/Box/WmsBoxResponse.cs
View File

@@ -58,6 +58,8 @@ namespace BarCode.Web.Core.Dto.Box
}
public class OpsSerialNumbersResponse
{
private int? isTwo;
/// <summary>
/// 序列号
/// </summary>
@@ -73,7 +75,20 @@ namespace BarCode.Web.Core.Dto.Box
/// </summary>
[JsonProperty("barCereateUser")]
public string BarCereateUser { get; set; }
/// <summary>
/// 是否套装
/// </summary>
public int? IsTwo { get; set; }
/// <summary>
/// 第二个序列号
/// </summary>
public string? TwoSerialNumber { get; set; }
/// <summary>
/// 是否不参与记数
/// </summary>
public string? IsNotCount { get; set; }
}
public class OpsBoxDetailsResponse {
/// <summary>

11
src/BarCode.Web.Domain/Services/BoxService.cs
View File

@@ -396,6 +396,12 @@ namespace BarCode.Web.Domain.Services
// var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
// var sentity = serialList.GetEntityListBySuitNumber(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
var serialList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(s);
//int isTwo = 1;
//if (serialList2.Count > 1)
//{
// isTwo = serialList2.Count;
//}
foreach (var s2 in serialList2)
{
@@ -407,7 +413,10 @@ namespace BarCode.Web.Domain.Services
{
SerialNumber = s2.SerialNumber,
BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
BarCreateTime = sentity == null ? null : sentity.CreateTime
BarCreateTime = sentity == null ? null : sentity.CreateTime,
IsTwo= s2.IsTwo,
TwoSerialNumber=s2.TwoSerialNumber,
IsNotCount=s2.isNotCount
});
}