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

修改了防伪码

Browse Source
This commit is contained in:
18923810322
2026-04-15 15:33:56 +08:00
parent e690af265a
commit 6b1224ebd0
4 changed files with 89 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
View File

@@ -506,6 +506,21 @@
物料编码
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumberGenerateRecord.MaterialName">
<summary>
名称
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumberGenerateRecord.Specifications">
<summary>
规格型号
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumberGenerateRecord.BarCode">
<summary>
69码
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumberGenerateRecord.CompanyId">
<summary>
公司Id
@@ -601,6 +616,21 @@
物料编码
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumbers.MaterialName">
<summary>
名称
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumbers.Specifications">
<summary>
规格型号
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumbers.BarCode">
<summary>
69码
</summary>
</member>
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumbers.DownLoadNumber">
<summary>
下载次数
@@ -3445,7 +3475,7 @@
防伪码
</summary>
</member>
<member name="M:BarCode.Web.Domain.Services.SecurityNumberService.#ctor(BarCode.Web.Domain.Infrastructure.ISecurityNumbersRepositories,BarCode.Web.Domain.Infrastructure.ISecurityGenerateRecordRepositories,BarCode.Web.Domain.Services.Public.RedisClientService,Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Logging.ILogger{BarCode.Web.Domain.Services.SecurityNumberService},BarCode.Web.Domain.Infrastructure.IBasicsRepositories,BarCode.Web.Domain.IService.Public.ISingleDataService)">
<member name="M:BarCode.Web.Domain.Services.SecurityNumberService.#ctor(BarCode.Web.Domain.Infrastructure.ISecurityNumbersRepositories,BarCode.Web.Domain.Infrastructure.ISecurityGenerateRecordRepositories,BarCode.Web.Domain.Services.Public.RedisClientService,Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Logging.ILogger{BarCode.Web.Domain.Services.SecurityNumberService},BarCode.Web.Domain.Infrastructure.IBasicsRepositories,BarCode.Web.Domain.IService.Public.ISingleDataService,BarCode.Web.Domain.IService.Public.IErpService,BarCode.Web.Domain.IService.Public.IErpBasicDataExtendService)">
<summary>
序列号服务
</summary>

20
src/BarCode.Web.Domain/Entitys/SecurityNumberGenerateRecord.cs
View File

@@ -30,6 +30,26 @@ namespace BarCode.Web.Domain.Entitys
/// </summary>
[Column("MaterialNumber")]
public string MaterialNumber { get; set; } = string.Empty;
/// <summary>
/// 名称
/// </summary>
[Column("MaterialName")]
public string? MaterialName { get; set; } = string.Empty;
/// <summary>
/// 规格型号
/// </summary>
[Column("Specifications")]
public string? Specifications { get; set; } = string.Empty;
/// <summary>
///69码
/// </summary>
[Column("BarCode")]
public string? BarCode { get; set; } = string.Empty;
/// <summary>
/// 公司Id
/// </summary>

20
src/BarCode.Web.Domain/Entitys/SecurityNumbers.cs
View File

@@ -46,6 +46,26 @@ namespace BarCode.Web.Domain.Entitys
/// </summary>
[Column("MaterialNumber")]
public string MaterialNumber { get; set; } = string.Empty;
/// <summary>
/// 名称
/// </summary>
[Column("MaterialName")]
public string? MaterialName { get; set; } = string.Empty;
/// <summary>
/// 规格型号
/// </summary>
[Column("Specifications")]
public string? Specifications { get; set; } = string.Empty;
/// <summary>
///69码
/// </summary>
[Column("BarCode")]
public string? BarCode { get; set; } = string.Empty;
/// <summary>
/// 下载次数
/// </summary>

20
src/BarCode.Web.Domain/Services/SecurityNumberService.cs
View File

@@ -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<SecurityNumberService> _logger;
private IBasicsRepositories _transactionRepositories;
private readonly ISingleDataService _singleDataService;
private readonly IErpService _erpService;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
/// <summary>
/// 序列号服务
/// </summary>
@@ -46,7 +49,7 @@ namespace BarCode.Web.Domain.Services
RedisClientService redisClientService,
IServiceScopeFactory serviceScopeFactory,
ILogger<SecurityNumberService> 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;
}
/// <summary>
/// 下载
@@ -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<ErpMaterialDto> materials = new List<ErpMaterialDto>();
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);