修改了修改过型号的条码不显示名称的问题

src/BarCode.Web.Api/Controllers/WmsBoxController.cs

@@ -1,20 +1,21 @@
 using AutoMapper;
+using BarCode.Web.Core.Dto.Box;
+using BarCode.Web.Core.Dto.SerialNumbers;
+using BarCode.Web.Core.Internal.Results;
+using BarCode.Web.Domain.Entitys;
 using BarCode.Web.Domain.Infrastructure;
-using BarCode.Web.Domain.IService.Public;
 using BarCode.Web.Domain.IService;
+using BarCode.Web.Domain.IService.Public;
+using BarCode.Web.Domain.Services.Public;
+using BarCode.Web.Domain.Values;
+using BarCode.Web.Domain.Values.Single;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using BarCode.Web.Core.Dto.Box;
-using BarCode.Web.Core.Internal.Results;
-using BarCode.Web.Domain.Values;
-using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 using NPOI.SS.Formula.Functions;
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using BarCode.Web.Core.Dto.SerialNumbers;
-using BarCode.Web.Domain.Services.Public;
-using BarCode.Web.Domain.Values.Single;
 using System.ComponentModel.Design;
+using System.Text.RegularExpressions;
 
 namespace BarCode.Web.Api.Controllers
 {
@@ -127,7 +128,10 @@ namespace BarCode.Web.Api.Controllers
                             TwoSerialNumber = entity.TwoNumberCode,
                             TwoNumberCode = entity.TwoNumberCode,
                             IsNotCount = entity.IsNotCount,
-                            NumberCode=entity.NumberCode
+                            NumberCode=entity.NumberCode,
+                            MaterialName= entity.MaterialName,
+                            Specifications=entity.Specifications,
+                            BarCode=entity.BarCode
 
                         };
                         var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]);
@@ -151,7 +155,10 @@ namespace BarCode.Web.Api.Controllers
                             TwoSerialNumber = entity.TwoSerialNumber,
                             TwoNumberCode = entity.TwoNumberCode,
                             IsNotCount = entity.IsNotCount,
-                            NumberCode = entity.NumberCode
+                            NumberCode = entity.NumberCode,
+                            MaterialName = entity.MaterialName,
+                            Specifications = entity.Specifications,
+                            BarCode = entity.BarCode
                         };
                         var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]);
                         entity2.WmsGet(s[i]);
@@ -173,7 +180,10 @@ namespace BarCode.Web.Api.Controllers
                     TwoSerialNumber = entity.TwoSerialNumber,
                     TwoNumberCode = entity.TwoNumberCode,
                     IsNotCount = entity.IsNotCount,
-                    NumberCode = entity.NumberCode
+                    NumberCode = entity.NumberCode,
+                    MaterialName = entity.MaterialName,
+                    Specifications = entity.Specifications,
+                    BarCode = entity.BarCode
                 };
                 entity.WmsGet(dto.SerialNumber);
                 list.Add(entity);

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

@@ -3645,6 +3645,21 @@
             是否不参与记数
             </summary>
         </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.MaterialName">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.Specifications">
+            <summary>
+            规格
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.BarCode">
+            <summary>
+            条码
+            </summary>
+        </member>
         <member name="T:BarCode.Web.Core.Dto.SerialNumbers.SGenerateRecordInfoResponse">
             <summary>
             序列号生成记录列表返回参数
@@ -3820,11 +3835,31 @@
             物料编码
             </summary>
         </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.UpdateMaterialRequest.specifications">
+            <summary>
+            物料规格
+            </summary>
+        </member>
         <member name="P:BarCode.Web.Core.Dto.SerialNumbers.UpdateMaterialRequest.SerialNumbers">
             <summary>
             操作(序列号)
             </summary>
         </member>
+        <member name="T:BarCode.Web.Core.Dto.SerialNumbers.Specifications">
+            <summary>
+            specifications
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.Specifications.serialNumber">
+            <summary>
+            serialNumber
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.Specifications.old_Specification">
+            <summary>
+            old_Specification
+            </summary>
+        </member>
         <member name="T:BarCode.Web.Core.Dto.SingleData.IdRequest">
             <summary>
             ID请求对象

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

@@ -828,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>
             老物料编码(上一次物料编码)
@@ -970,7 +985,7 @@
             wms系统获取序列码后 序列码调整为已使用
             </summary>
         </member>
-        <member name="M:BarCode.Web.Domain.Entitys.SerialNumbers.UpdateMaterial(System.String,System.String)">
+        <member name="M:BarCode.Web.Domain.Entitys.SerialNumbers.UpdateMaterial(System.String,System.String,System.String,System.String,System.String)">
             <summary>
             修改物料编码
             </summary>

src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs

@@ -54,7 +54,20 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
         public string? NumberCode { get; set; } = string.Empty;
 
 
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string? MaterialName { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 规格
+        /// </summary>
+        public string? Specifications { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 条码
+        /// </summary>
+        public string? BarCode { get; set; } = string.Empty;
 
     }
 }

src/BarCode.Web.Core/Dto/SerialNumbers/UpdateMaterialRequest.cs

@@ -1,4 +1,5 @@
-using System;
+using BarCode.Web.Core.Dto.Box;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -22,11 +23,29 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
         /// </summary>
         [Required(ErrorMessage = "物料编码不能为空")]
         public string MaterialNumber { get; set; } = string.Empty;
-        public string specifications { get; set; } = string.Empty;
+        /// <summary>
+        /// 物料规格
+        /// </summary>
+        public List<Specifications> specifications { get; set; } = new List<Specifications>();
 
         /// <summary>
         /// 操作(序列号)
         /// </summary>
         public List<string> SerialNumbers { get; set; } = new List<string>();
     }
+    /// <summary>
+    /// specifications
+    /// </summary>
+    public class Specifications
+    {
+        /// <summary>
+        /// serialNumber
+        /// </summary>
+        public string serialNumber { get; set; } = string.Empty;
+        /// <summary>
+        /// old_Specification
+        /// </summary>
+        public string old_Specification { get; set; } = string.Empty;
+    }
+
 }

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

@@ -81,23 +81,23 @@ namespace BarCode.Web.Domain.Entitys
         public string MaterialNumber { get; set; } = string.Empty;
 
 
-        ///// <summary>
-        ///// 名称
-        ///// </summary>
-        //[Column("MaterialName")]
-        //public string MaterialName { get; set; } = "";
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [Column("MaterialName")]
+        public string? MaterialName { get; set; } = string.Empty;
 
-        ///// <summary>
-        ///// 规格型号
-        ///// </summary>
-        //[Column("Specifications")]
-        //public string Specifications { get; set; } = "";
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        [Column("Specifications")]
+        public string? Specifications { get; set; } = string.Empty;
 
-        ///// <summary>
-        /////69码
-        ///// </summary>
-        //[Column("BarCode")]
-        //public string BarCode { get; set; } = "";
+        /// <summary>
+        ///69码
+        /// </summary>
+        [Column("BarCode")]
+        public string? BarCode { get; set; } = string.Empty;
 
         /// <summary>
         /// 老物料编码(上一次物料编码)
@@ -336,15 +336,19 @@ namespace BarCode.Web.Domain.Entitys
         /// 修改物料编码
         /// </summary>
         /// <param name="number"></param>
-        public Result UpdateMaterial(string number,string Specifications)
+        public Result UpdateMaterial(string number,string MaterialName,string MaterialSpecifications,string MaterialBarCode, string old_Specifications)
         {
             if (this.IsUse)
                 return Result.ReFailure($"序列码 {this.SerialNumber} 已被使用,不允许规格转换", 600007);
             if (!this.MaterialNumber.Equals(number))
             {
                 this.Old_MaterialNumber = this.MaterialNumber;
-                this.old_Specifications = Specifications;
+                this.old_Specifications = old_Specifications;
+                this.MaterialName= MaterialName;
+                this.Specifications= MaterialSpecifications;
+                this.BarCode= MaterialBarCode;
                 this.MaterialNumber = number;
+                
             }
 
             return Result.ReSuccess();

src/BarCode.Web.Domain/Services/SerialNumberService.cs

@@ -261,9 +261,9 @@ namespace BarCode.Web.Domain.Services
                                 SerialNumber = sg.IdConvertBar,
                                 MaterialNumber = sg.MaterialNumber,
 
-                                //MaterialName=sg.MaterialName,
-                                //Specifications = sg.Specifications,
-                                //BarCode = sg.BarCode,
+                                MaterialName = sg.MaterialName,
+                                Specifications = sg.Specifications,
+                                BarCode = sg.BarCode,
 
                                 Number = sg.BeginNumber + i,
                                 IsTwo = sg.IsTwo,
@@ -854,7 +854,7 @@ namespace BarCode.Web.Domain.Services
             //修改物料
             foreach (var s in serialNumbers)
             {
-                var res = s.UpdateMaterial(dto.MaterialNumber,dto.specifications);// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber));
+                var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialName(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialBarCode(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber));// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber));
                 if (!res.IsSuccess) return res;
             }
             generateRecord.UpdateMaterial();

src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs

@@ -192,6 +192,8 @@ namespace BarCode.Web.Repositories
             int companyId = loginInfo.UserInfo.CompanyId;
 
             List<string> mNumber = new List<string>();
+            List<string> mSpec = new List<string>();
+            List<string> mName = new List<string>();
             var materials_result = await _erpService.BillQueryForMaterial();
             List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
             if (materials_result.IsSuccess)
@@ -200,11 +202,22 @@ namespace BarCode.Web.Repositories
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
             {
                 if (materials != null)
+                { 
                     mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
                     || w.MaterialName.Contains(dto.MaterialNumber)
                     || w.Specifications.Contains(dto.MaterialNumber)
                     ).Select(s => s.MaterialNumber).ToList();
+                    mSpec = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
+                    || w.MaterialName.Contains(dto.MaterialNumber)
+                    || w.Specifications.Contains(dto.MaterialNumber)
+                    ).Select(s => s.Specifications).ToList();
+                    mName = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
+                    || w.MaterialName.Contains(dto.MaterialNumber)
+                    || w.Specifications.Contains(dto.MaterialNumber)
+                    ).Select(s => s.MaterialName).ToList();
+                }
             }
+
             List<int> cr_ids = new List<int>();
             if (!string.IsNullOrEmpty(dto.CreateUser))
             {
@@ -277,6 +290,11 @@ namespace BarCode.Web.Repositories
             }
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
                 query = query.Where(w => mNumber.Contains(w.MaterialNumber));
+            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+                query = query.Where(w => (mSpec.Contains(w.Specifications)));
+
+
+
             if (dto.CreateBeginDate != null)
                 query = query.Where(w => w.GenerateCompleteTime >= dto.CreateBeginDate);
             if (dto.CreateEndDate != null)
@@ -296,6 +314,7 @@ namespace BarCode.Web.Repositories
                 query = query.Where(w => dto.GenerateComplete == w.IsGenerateComplete);
             if (!string.IsNullOrEmpty(dto.CreateUser))
                 query = query.Where(w => cr_ids.Contains(w.CreatorId));
+            
             if (dto.IsUpdateMaterial != null)
             {
                 if (dto.IsUpdateMaterial == true)

src/BarCode.Web.Repositories/SerialNumbersRepositories.cs

@@ -15,6 +15,7 @@ using BarCode.Web.Repositories.Configuration;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
+using Microsoft.IdentityModel.Tokens;
 using Npoi.Mapper;
 using NPOI.OpenXmlFormats.Wordprocessing;
 using NPOI.POIFS.FileSystem;
@@ -358,11 +359,11 @@ namespace BarCode.Web.Repositories
             int total = await query.CountAsync();
             var list = await query.Select(s => new SerialNumberInfoResponse()
             {
-                Specifications = s.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
+                Specifications =string.IsNullOrEmpty(s.serial.Specifications)?s.sg.Specifications: s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
                 Old_Specifications = s.serial.old_Specifications==null?(_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber)) : s.serial.old_Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
                 MaterialNumber = s.serial.MaterialNumber,
-                MaterialName = s.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
-                BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
+                MaterialName = string.IsNullOrEmpty(s.serial.MaterialName)? s.sg.MaterialName: s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
+                BarCode = s.serial.BarCode==null ? s.sg.BarCode: s.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
                 SerialNumber = s.serial.SerialNumber,
                 NumberCode = s.serial.NumberCode,
                 Number = s.sg == null ? 0 : s.sg.Number,
@@ -931,10 +932,13 @@ namespace BarCode.Web.Repositories
                 BoxId = entity.serial.BoxId,
                 IsCarton = (entity.serial.BoxId > 0 || entity.serial.IsUse == true) ? true : false,
                 IsOldData = false,//根据序列号获取 默认是false
-                Specifications = entity.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialNumber),
+                                  //Specifications = entity.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialNumber),
+                Specifications = string.IsNullOrEmpty(entity.serial.Specifications) ? entity.sg.Specifications : entity.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
                 MaterialNumber = entity.serial.MaterialNumber,
-                MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber),
-                BarCode = entity.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, entity.MaterialNumber),
+                //MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber),
+                MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName) ? entity.sg.MaterialName : entity.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),                
+                                                                                                                                      //BarCode = entity.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, entity.MaterialNumber),
+                BarCode = string.IsNullOrEmpty(entity.serial.BarCode) ? (string.IsNullOrEmpty(entity.serial.Old_MaterialNumber)?entity.sg.BarCode: entity.serial.BarCode) : entity.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
                 SerialNumber = entity.serial.SerialNumber,
                 IsUseNumber = entity.serial.IsUseNumber,
                 NumberCode = entity.serial.NumberCode,