修改了保存名称

src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml

@@ -651,6 +651,21 @@
             物料编码
             </summary>
         </member>
+        <member name="P:BarCode.Web.Domain.Entitys.SerialNumberGenerateRecord.MaterialName">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Domain.Entitys.SerialNumberGenerateRecord.Specifications">
+            <summary>
+            规格型号
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Domain.Entitys.SerialNumberGenerateRecord.BarCode">
+             <summary>
+            69码
+             </summary>
+        </member>
         <member name="P:BarCode.Web.Domain.Entitys.SerialNumberGenerateRecord.IsUpdateMaterial">
             <summary>
             是否更改过物料编码
@@ -813,6 +828,21 @@
             物料编码
             </summary>
         </member>
+        <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.MaterialName">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.Specifications">
+            <summary>
+            规格型号
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.BarCode">
+             <summary>
+            69码
+             </summary>
+        </member>
         <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.Old_MaterialNumber">
             <summary>
             老物料编码(上一次物料编码)
@@ -3434,7 +3464,7 @@
             序列号服务
             </summary>
         </member>
-        <member name="M:BarCode.Web.Domain.Services.SerialNumberService.#ctor(BarCode.Web.Domain.Infrastructure.ISerialNumbersRepositories,BarCode.Web.Domain.Infrastructure.ISGenerateRecordRepositories,BarCode.Web.Domain.Services.Public.RedisClientService,Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Logging.ILogger{BarCode.Web.Domain.Services.SerialNumberService},BarCode.Web.Domain.Infrastructure.IBasicsRepositories,BarCode.Web.Domain.Infrastructure.ICenerateDataRepositories,BarCode.Web.Domain.IService.Public.ISingleDataService,BarCode.Web.Domain.IService.Public.IErpService)">
+        <member name="M:BarCode.Web.Domain.Services.SerialNumberService.#ctor(BarCode.Web.Domain.Infrastructure.ISerialNumbersRepositories,BarCode.Web.Domain.Infrastructure.ISGenerateRecordRepositories,BarCode.Web.Domain.Services.Public.RedisClientService,Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Logging.ILogger{BarCode.Web.Domain.Services.SerialNumberService},BarCode.Web.Domain.Infrastructure.IBasicsRepositories,BarCode.Web.Domain.Infrastructure.ICenerateDataRepositories,BarCode.Web.Domain.IService.Public.ISingleDataService,BarCode.Web.Domain.IService.Public.IErpService,BarCode.Web.Domain.IService.Public.IErpBasicDataExtendService)">
             <summary>
             序列号服务
             </summary>

src/BarCode.Web.Domain/Entitys/SerialNumberGenerateRecord.cs

@@ -31,6 +31,25 @@ namespace BarCode.Web.Domain.Entitys
         /// </summary>
         [Column("MaterialNumber")]
         public string MaterialNumber { get; set; } = "";
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [Column("MaterialName")]
+        public string MaterialName { get; set; } = "";
+
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        [Column("Specifications")]
+        public string Specifications { get; set; } = "";
+
+        /// <summary>
+        ///69码
+        /// </summary>
+        [Column("BarCode")]
+        public string BarCode { get; set; } = "";
+
         /// <summary>
         /// 是否更改过物料编码
         /// </summary>

src/BarCode.Web.Domain/Entitys/SerialNumbers.cs

@@ -79,6 +79,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; } = "";
+
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        [Column("Specifications")]
+        public string Specifications { get; set; } = "";
+
+        /// <summary>
+        ///69码
+        /// </summary>
+        [Column("BarCode")]
+        public string BarCode { get; set; } = "";
+
         /// <summary>
         /// 老物料编码(上一次物料编码)
         /// </summary>

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;
         /// <summary>
         /// 序列号服务
         /// </summary>
@@ -59,7 +60,7 @@ namespace BarCode.Web.Domain.Services
             RedisClientService redisClientService,
             IServiceScopeFactory serviceScopeFactory,
             ILogger<SerialNumberService> 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;
         }
 
         /// <summary>
@@ -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