修改了防伪码
This commit is contained in:
@@ -506,6 +506,21 @@
|
|||||||
物料编码
|
物料编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumberGenerateRecord.CompanyId">
|
||||||
<summary>
|
<summary>
|
||||||
公司Id
|
公司Id
|
||||||
@@ -601,6 +616,21 @@
|
|||||||
物料编码
|
物料编码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="P:BarCode.Web.Domain.Entitys.SecurityNumbers.DownLoadNumber">
|
||||||
<summary>
|
<summary>
|
||||||
下载次数
|
下载次数
|
||||||
@@ -3445,7 +3475,7 @@
|
|||||||
防伪码
|
防伪码
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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>
|
||||||
序列号服务
|
序列号服务
|
||||||
</summary>
|
</summary>
|
||||||
|
|||||||
@@ -30,6 +30,26 @@ namespace BarCode.Web.Domain.Entitys
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("MaterialNumber")]
|
[Column("MaterialNumber")]
|
||||||
public string MaterialNumber { get; set; } = string.Empty;
|
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>
|
||||||
/// 公司Id
|
/// 公司Id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -46,6 +46,26 @@ namespace BarCode.Web.Domain.Entitys
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("MaterialNumber")]
|
[Column("MaterialNumber")]
|
||||||
public string MaterialNumber { get; set; } = string.Empty;
|
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>
|
||||||
/// 下载次数
|
/// 下载次数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -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.Dto.SecurityNumbers;
|
||||||
using BarCode.Web.Core.Internal.Results;
|
using BarCode.Web.Core.Internal.Results;
|
||||||
using BarCode.Web.Domain.Entitys;
|
using BarCode.Web.Domain.Entitys;
|
||||||
@@ -32,6 +33,8 @@ namespace BarCode.Web.Domain.Services
|
|||||||
private readonly ILogger<SecurityNumberService> _logger;
|
private readonly ILogger<SecurityNumberService> _logger;
|
||||||
private IBasicsRepositories _transactionRepositories;
|
private IBasicsRepositories _transactionRepositories;
|
||||||
private readonly ISingleDataService _singleDataService;
|
private readonly ISingleDataService _singleDataService;
|
||||||
|
private readonly IErpService _erpService;
|
||||||
|
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 序列号服务
|
/// 序列号服务
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -46,7 +49,7 @@ namespace BarCode.Web.Domain.Services
|
|||||||
RedisClientService redisClientService,
|
RedisClientService redisClientService,
|
||||||
IServiceScopeFactory serviceScopeFactory,
|
IServiceScopeFactory serviceScopeFactory,
|
||||||
ILogger<SecurityNumberService> logger, IBasicsRepositories transactionRepositories,
|
ILogger<SecurityNumberService> logger, IBasicsRepositories transactionRepositories,
|
||||||
ISingleDataService singleDataService)
|
ISingleDataService singleDataService, IErpService erpService, IErpBasicDataExtendService erpBasicDataExtendService)
|
||||||
{
|
{
|
||||||
_securityNumbersRepositories = securityNumbersRepositories;
|
_securityNumbersRepositories = securityNumbersRepositories;
|
||||||
_sGenerateRecordRepositories = sGenerateRecordRepositories;
|
_sGenerateRecordRepositories = sGenerateRecordRepositories;
|
||||||
@@ -55,6 +58,8 @@ namespace BarCode.Web.Domain.Services
|
|||||||
_logger = logger;
|
_logger = logger;
|
||||||
_transactionRepositories = transactionRepositories;
|
_transactionRepositories = transactionRepositories;
|
||||||
_singleDataService = singleDataService;
|
_singleDataService = singleDataService;
|
||||||
|
_erpService = erpService;
|
||||||
|
_erpBasicDataExtendService = erpBasicDataExtendService;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 下载
|
/// 下载
|
||||||
@@ -123,6 +128,11 @@ namespace BarCode.Web.Domain.Services
|
|||||||
if (info == true) return Task.FromResult(Result.ReFailure(ResultCodes.SecurityNumberG));
|
if (info == true) return Task.FromResult(Result.ReFailure(ResultCodes.SecurityNumberG));
|
||||||
_redisClientService.SetStringKey($"barcode_cenerate_security", true, TimeSpan.FromMinutes(5));
|
_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 supplierCode = "";
|
||||||
string orgCode = "";
|
string orgCode = "";
|
||||||
if (dto.OrgCode.Substring(0, 1).Equals("s"))
|
if (dto.OrgCode.Substring(0, 1).Equals("s"))
|
||||||
@@ -140,6 +150,9 @@ namespace BarCode.Web.Domain.Services
|
|||||||
OrgCode = orgCode,
|
OrgCode = orgCode,
|
||||||
SupplierCode = supplierCode,
|
SupplierCode = supplierCode,
|
||||||
MaterialNumber = dto.MaterialNumber,
|
MaterialNumber = dto.MaterialNumber,
|
||||||
|
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber),
|
||||||
|
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, dto.MaterialNumber),
|
||||||
|
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, dto.MaterialNumber),
|
||||||
Number = dto.Number
|
Number = dto.Number
|
||||||
};
|
};
|
||||||
sg.GenerateLotNumber(number);
|
sg.GenerateLotNumber(number);
|
||||||
@@ -197,6 +210,9 @@ namespace BarCode.Web.Domain.Services
|
|||||||
OrgCode = sg.OrgCode,
|
OrgCode = sg.OrgCode,
|
||||||
SupplierCode = sg.SupplierCode,
|
SupplierCode = sg.SupplierCode,
|
||||||
MaterialNumber = sg.MaterialNumber,
|
MaterialNumber = sg.MaterialNumber,
|
||||||
|
MaterialName = sg.MaterialName,
|
||||||
|
Specifications = sg.Specifications,
|
||||||
|
BarCode = sg.BarCode,
|
||||||
GenerateRecordId = sg.Id
|
GenerateRecordId = sg.Id
|
||||||
};
|
};
|
||||||
sList.Add(s);
|
sList.Add(s);
|
||||||
|
|||||||
Reference in New Issue
Block a user