diff --git a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
index e0030aa..ded2af6 100644
--- a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
+++ b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
@@ -1,20 +1,21 @@
using AutoMapper;
+using BarCode.Web.Core.Dto.Box;
+using BarCode.Web.Core.Dto.SerialNumbers;
+using BarCode.Web.Core.Internal.Results;
+using BarCode.Web.Domain.Entitys;
using BarCode.Web.Domain.Infrastructure;
-using BarCode.Web.Domain.IService.Public;
using BarCode.Web.Domain.IService;
+using BarCode.Web.Domain.IService.Public;
+using BarCode.Web.Domain.Services.Public;
+using BarCode.Web.Domain.Values;
+using BarCode.Web.Domain.Values.Single;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using BarCode.Web.Core.Dto.Box;
-using BarCode.Web.Core.Internal.Results;
-using BarCode.Web.Domain.Values;
-using System.Text.RegularExpressions;
+using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using System.Collections.Generic;
-using Newtonsoft.Json;
-using BarCode.Web.Core.Dto.SerialNumbers;
-using BarCode.Web.Domain.Services.Public;
-using BarCode.Web.Domain.Values.Single;
using System.ComponentModel.Design;
+using System.Text.RegularExpressions;
namespace BarCode.Web.Api.Controllers
{
@@ -127,7 +128,10 @@ namespace BarCode.Web.Api.Controllers
TwoSerialNumber = entity.TwoNumberCode,
TwoNumberCode = entity.TwoNumberCode,
IsNotCount = entity.IsNotCount,
- NumberCode=entity.NumberCode
+ NumberCode=entity.NumberCode,
+ MaterialName= entity.MaterialName,
+ Specifications=entity.Specifications,
+ BarCode=entity.BarCode
};
var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]);
@@ -151,7 +155,10 @@ namespace BarCode.Web.Api.Controllers
TwoSerialNumber = entity.TwoSerialNumber,
TwoNumberCode = entity.TwoNumberCode,
IsNotCount = entity.IsNotCount,
- NumberCode = entity.NumberCode
+ NumberCode = entity.NumberCode,
+ MaterialName = entity.MaterialName,
+ Specifications = entity.Specifications,
+ BarCode = entity.BarCode
};
var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]);
entity2.WmsGet(s[i]);
@@ -173,7 +180,10 @@ namespace BarCode.Web.Api.Controllers
TwoSerialNumber = entity.TwoSerialNumber,
TwoNumberCode = entity.TwoNumberCode,
IsNotCount = entity.IsNotCount,
- NumberCode = entity.NumberCode
+ NumberCode = entity.NumberCode,
+ MaterialName = entity.MaterialName,
+ Specifications = entity.Specifications,
+ BarCode = entity.BarCode
};
entity.WmsGet(dto.SerialNumber);
list.Add(entity);
diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
index 98f4eb7..2c9b3d9 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
@@ -3645,6 +3645,21 @@
是否不参与记数
+
+
+ 名称
+
+
+
+
+ 规格
+
+
+
+
+ 条码
+
+
序列号生成记录列表返回参数
diff --git a/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs b/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
index 26718bc..857a8b8 100644
--- a/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
+++ b/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
@@ -54,7 +54,20 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
public string? NumberCode { get; set; } = string.Empty;
+ ///
+ /// 名称
+ ///
+ public string? MaterialName { get; set; } = string.Empty;
+ ///
+ /// 规格
+ ///
+ public string? Specifications { get; set; } = string.Empty;
+
+ ///
+ /// 条码
+ ///
+ public string? BarCode { get; set; } = string.Empty;
}
}