diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
index 0bbe084..9872d57 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
@@ -506,6 +506,21 @@
物料编码
+
+
+ 名称
+
+
+
+
+ 规格型号
+
+
+
+
+ 69码
+
+
公司Id
@@ -601,6 +616,21 @@
物料编码
+
+
+ 名称
+
+
+
+
+ 规格型号
+
+
+
+
+ 69码
+
+
下载次数
@@ -3445,7 +3475,7 @@
防伪码
-
+
序列号服务
diff --git a/src/BarCode.Web.Domain/Entitys/SecurityNumberGenerateRecord.cs b/src/BarCode.Web.Domain/Entitys/SecurityNumberGenerateRecord.cs
index a2e7607..1a27dd1 100644
--- a/src/BarCode.Web.Domain/Entitys/SecurityNumberGenerateRecord.cs
+++ b/src/BarCode.Web.Domain/Entitys/SecurityNumberGenerateRecord.cs
@@ -30,6 +30,26 @@ namespace BarCode.Web.Domain.Entitys
///
[Column("MaterialNumber")]
public string MaterialNumber { get; set; } = string.Empty;
+
+
+ ///
+ /// 名称
+ ///
+ [Column("MaterialName")]
+ public string? MaterialName { get; set; } = string.Empty;
+
+ ///
+ /// 规格型号
+ ///
+ [Column("Specifications")]
+ public string? Specifications { get; set; } = string.Empty;
+
+ ///
+ ///69码
+ ///
+ [Column("BarCode")]
+ public string? BarCode { get; set; } = string.Empty;
+
///
/// 公司Id
///
diff --git a/src/BarCode.Web.Domain/Entitys/SecurityNumbers.cs b/src/BarCode.Web.Domain/Entitys/SecurityNumbers.cs
index adc830a..7214791 100644
--- a/src/BarCode.Web.Domain/Entitys/SecurityNumbers.cs
+++ b/src/BarCode.Web.Domain/Entitys/SecurityNumbers.cs
@@ -46,6 +46,26 @@ namespace BarCode.Web.Domain.Entitys
///
[Column("MaterialNumber")]
public string MaterialNumber { get; set; } = string.Empty;
+
+
+ ///
+ /// 名称
+ ///
+ [Column("MaterialName")]
+ public string? MaterialName { get; set; } = string.Empty;
+
+ ///
+ /// 规格型号
+ ///
+ [Column("Specifications")]
+ public string? Specifications { get; set; } = string.Empty;
+
+ ///
+ ///69码
+ ///
+ [Column("BarCode")]
+ public string? BarCode { get; set; } = string.Empty;
+
///
/// 下载次数
///
diff --git a/src/BarCode.Web.Domain/Services/SecurityNumberService.cs b/src/BarCode.Web.Domain/Services/SecurityNumberService.cs
index 57b2122..fb49bc7 100644
--- a/src/BarCode.Web.Domain/Services/SecurityNumberService.cs
+++ b/src/BarCode.Web.Domain/Services/SecurityNumberService.cs
@@ -1,4 +1,5 @@
-using BarCode.Web.Core.Dto.Login;
+using BarCode.Web.Core.Dto.Erp;
+using BarCode.Web.Core.Dto.Login;
using BarCode.Web.Core.Dto.SecurityNumbers;
using BarCode.Web.Core.Internal.Results;
using BarCode.Web.Domain.Entitys;
@@ -32,6 +33,8 @@ namespace BarCode.Web.Domain.Services
private readonly ILogger _logger;
private IBasicsRepositories _transactionRepositories;
private readonly ISingleDataService _singleDataService;
+ private readonly IErpService _erpService;
+ private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
///
/// 序列号服务
///
@@ -46,7 +49,7 @@ namespace BarCode.Web.Domain.Services
RedisClientService redisClientService,
IServiceScopeFactory serviceScopeFactory,
ILogger logger, IBasicsRepositories transactionRepositories,
- ISingleDataService singleDataService)
+ ISingleDataService singleDataService, IErpService erpService, IErpBasicDataExtendService erpBasicDataExtendService)
{
_securityNumbersRepositories = securityNumbersRepositories;
_sGenerateRecordRepositories = sGenerateRecordRepositories;
@@ -55,6 +58,8 @@ namespace BarCode.Web.Domain.Services
_logger = logger;
_transactionRepositories = transactionRepositories;
_singleDataService = singleDataService;
+ _erpService = erpService;
+ _erpBasicDataExtendService = erpBasicDataExtendService;
}
///
/// 下载
@@ -123,6 +128,11 @@ namespace BarCode.Web.Domain.Services
if (info == true) return Task.FromResult(Result.ReFailure(ResultCodes.SecurityNumberG));
_redisClientService.SetStringKey($"barcode_cenerate_security", true, TimeSpan.FromMinutes(5));
+ var materials_result = _erpService.BillQueryForMaterial().GetAwaiter().GetResult();
+ List materials = new List();
+ if (materials_result.IsSuccess)
+ materials = materials_result.Data.ToList();
+
string supplierCode = "";
string orgCode = "";
if (dto.OrgCode.Substring(0, 1).Equals("s"))
@@ -140,6 +150,9 @@ namespace BarCode.Web.Domain.Services
OrgCode = orgCode,
SupplierCode = supplierCode,
MaterialNumber = dto.MaterialNumber,
+ Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber),
+ MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, dto.MaterialNumber),
+ BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, dto.MaterialNumber),
Number = dto.Number
};
sg.GenerateLotNumber(number);
@@ -197,6 +210,9 @@ namespace BarCode.Web.Domain.Services
OrgCode = sg.OrgCode,
SupplierCode = sg.SupplierCode,
MaterialNumber = sg.MaterialNumber,
+ MaterialName = sg.MaterialName,
+ Specifications = sg.Specifications,
+ BarCode = sg.BarCode,
GenerateRecordId = sg.Id
};
sList.Add(s);