From fa0dc54d835d7aee6d612ea2893c9e772d2ca129 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Fri, 27 Feb 2026 17:41:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/BarCode.Web.Domain.xml | 32 ++++++++++++++++++- .../Entitys/SerialNumberGenerateRecord.cs | 19 +++++++++++ .../Entitys/SerialNumbers.cs | 20 ++++++++++++ .../Services/SerialNumberService.cs | 15 ++++++++- 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml index ccfbebe..7cfe05b 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml @@ -651,6 +651,21 @@ 物料编码 + + + 名称 + + + + + 规格型号 + + + + + 69码 + + 是否更改过物料编码 @@ -813,6 +828,21 @@ 物料编码 + + + 名称 + + + + + 规格型号 + + + + + 69码 + + 老物料编码(上一次物料编码) @@ -3434,7 +3464,7 @@ 序列号服务 - + 序列号服务 diff --git a/src/BarCode.Web.Domain/Entitys/SerialNumberGenerateRecord.cs b/src/BarCode.Web.Domain/Entitys/SerialNumberGenerateRecord.cs index 8814ee6..35a3212 100644 --- a/src/BarCode.Web.Domain/Entitys/SerialNumberGenerateRecord.cs +++ b/src/BarCode.Web.Domain/Entitys/SerialNumberGenerateRecord.cs @@ -31,6 +31,25 @@ namespace BarCode.Web.Domain.Entitys /// [Column("MaterialNumber")] public string MaterialNumber { get; set; } = ""; + + /// + /// 名称 + /// + [Column("MaterialName")] + public string MaterialName { get; set; } = ""; + + /// + /// 规格型号 + /// + [Column("Specifications")] + public string Specifications { get; set; } = ""; + + /// + ///69码 + /// + [Column("BarCode")] + public string BarCode { get; set; } = ""; + /// /// 是否更改过物料编码 /// diff --git a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs index 2149c9f..ff999ff 100644 --- a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs @@ -79,6 +79,26 @@ namespace BarCode.Web.Domain.Entitys /// [Column("MaterialNumber")] public string MaterialNumber { get; set; } = string.Empty; + + + /// + /// 名称 + /// + [Column("MaterialName")] + public string MaterialName { get; set; } = ""; + + /// + /// 规格型号 + /// + [Column("Specifications")] + public string Specifications { get; set; } = ""; + + /// + ///69码 + /// + [Column("BarCode")] + public string BarCode { get; set; } = ""; + /// /// 老物料编码(上一次物料编码) /// diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index 116978b..a434ce9 100644 --- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs +++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs @@ -44,6 +44,7 @@ namespace BarCode.Web.Domain.Services private ICenerateDataRepositories _cenerateDataRepositories; private readonly ISingleDataService _singleDataService; private readonly IErpService _erpService; + private readonly IErpBasicDataExtendService _erpBasicDataExtendService; /// /// 序列号服务 /// @@ -59,7 +60,7 @@ namespace BarCode.Web.Domain.Services RedisClientService redisClientService, IServiceScopeFactory serviceScopeFactory, ILogger logger, IBasicsRepositories transactionRepositories, - ICenerateDataRepositories cenerateDataRepositories, ISingleDataService singleDataService, IErpService erpService) + ICenerateDataRepositories cenerateDataRepositories, ISingleDataService singleDataService, IErpService erpService, IErpBasicDataExtendService erpBasicDataExtendService) { _serialNumbersRepositories = serialNumbersRepositories; _sGenerateRecordRepositories = sGenerateRecordRepositories; @@ -70,6 +71,7 @@ namespace BarCode.Web.Domain.Services _cenerateDataRepositories = cenerateDataRepositories; _singleDataService = singleDataService; _erpService = erpService; + _erpBasicDataExtendService = erpBasicDataExtendService; } /// @@ -102,6 +104,7 @@ namespace BarCode.Web.Domain.Services { var m = materials.FirstOrDefault(w => w.Specifications.Equals(s)&& w.isDis=="1"); + var details = dto.Details.Where(w => w.Specifications.Equals(s)).ToList(); if (m == null) { @@ -114,6 +117,7 @@ namespace BarCode.Web.Domain.Services de.MaterialNumber = m.MaterialNumber; //de.MaterialNumber = g.MaterialNumber; de.IdConvertBar = m.IdConvertBar; + } } @@ -173,6 +177,9 @@ namespace BarCode.Web.Domain.Services OrgCode = orgCode, IdConvertBar = d.IdConvertBar, MaterialNumber = d.MaterialNumber, + Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialNumber), + MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialNumber), + BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, d.MaterialNumber), Number = d.Number, BeginNumber = beginNumber, PurchaseBillNo = d.PurchaseBillNo, @@ -182,6 +189,7 @@ namespace BarCode.Web.Domain.Services }; //下一个物料开始数量要重新赋值 beginNumber = beginNumber + d.Number; + sgList.Add(sg); } IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); @@ -252,6 +260,11 @@ namespace BarCode.Web.Domain.Services SupplierCode = sg.SupplierCode, SerialNumber = sg.IdConvertBar, MaterialNumber = sg.MaterialNumber, + + MaterialName=sg.MaterialName, + Specifications = sg.Specifications, + BarCode = sg.BarCode, + Number = sg.BeginNumber + i, IsTwo = sg.IsTwo, thisNumber = i+1,//alter by yzh