加了两件装的返回
This commit is contained in:
@@ -748,6 +748,21 @@
|
|||||||
序列号生成用户
|
序列号生成用户
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="P:BarCode.Web.Core.Dto.Box.OpsBoxDetailsResponse.MaterialNumber">
|
||||||
<summary>
|
<summary>
|
||||||
物料编码
|
物料编码
|
||||||
|
|||||||
@@ -58,6 +58,8 @@ namespace BarCode.Web.Core.Dto.Box
|
|||||||
}
|
}
|
||||||
public class OpsSerialNumbersResponse
|
public class OpsSerialNumbersResponse
|
||||||
{
|
{
|
||||||
|
private int? isTwo;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 序列号
|
/// 序列号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -73,7 +75,20 @@ namespace BarCode.Web.Core.Dto.Box
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[JsonProperty("barCereateUser")]
|
[JsonProperty("barCereateUser")]
|
||||||
public string BarCereateUser { get; set; }
|
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 {
|
public class OpsBoxDetailsResponse {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -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.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
|
||||||
// var sentity = serialList.GetEntityListBySuitNumber(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);
|
var serialList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(s);
|
||||||
|
//int isTwo = 1;
|
||||||
|
|
||||||
|
//if (serialList2.Count > 1)
|
||||||
|
//{
|
||||||
|
// isTwo = serialList2.Count;
|
||||||
|
//}
|
||||||
|
|
||||||
foreach (var s2 in serialList2)
|
foreach (var s2 in serialList2)
|
||||||
{
|
{
|
||||||
@@ -407,7 +413,10 @@ namespace BarCode.Web.Domain.Services
|
|||||||
{
|
{
|
||||||
SerialNumber = s2.SerialNumber,
|
SerialNumber = s2.SerialNumber,
|
||||||
BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
|
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
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user