diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
index 788cabf..3623e09 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
@@ -748,6 +748,21 @@
序列号生成用户
+
+
+ 是否套装
+
+
+
+
+ 第二个序列号
+
+
+
+
+ 是否不参与记数
+
+
物料编码
diff --git a/src/BarCode.Web.Core/Dto/Box/WmsBoxResponse.cs b/src/BarCode.Web.Core/Dto/Box/WmsBoxResponse.cs
index cd091dc..44a7691 100644
--- a/src/BarCode.Web.Core/Dto/Box/WmsBoxResponse.cs
+++ b/src/BarCode.Web.Core/Dto/Box/WmsBoxResponse.cs
@@ -58,6 +58,8 @@ namespace BarCode.Web.Core.Dto.Box
}
public class OpsSerialNumbersResponse
{
+ private int? isTwo;
+
///
/// 序列号
///
@@ -73,7 +75,20 @@ namespace BarCode.Web.Core.Dto.Box
///
[JsonProperty("barCereateUser")]
public string BarCereateUser { get; set; }
-
+ ///
+ /// 是否套装
+ ///
+ public int? IsTwo { get; set; }
+ ///
+ /// 第二个序列号
+ ///
+ public string? TwoSerialNumber { get; set; }
+ ///
+ /// 是否不参与记数
+ ///
+ public string? IsNotCount { get; set; }
+
+
}
public class OpsBoxDetailsResponse {
///
diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs
index 9cc26ba..35bdb6e 100644
--- a/src/BarCode.Web.Domain/Services/BoxService.cs
+++ b/src/BarCode.Web.Domain/Services/BoxService.cs
@@ -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
});
}