改了规格查义

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -340,8 +340,8 @@ namespace BarCode.Web.Domain.Entitys
         {
             if (this.IsUse)
                 return Result.ReFailure($"序列码 {this.SerialNumber} 已被使用,不允许规格转换", 600007);
-            if (!this.MaterialNumber.Equals(number))
+            //if (!this.MaterialNumber.Equals(number) )
-            {
+            //{
                 this.Old_MaterialNumber = this.MaterialNumber;
                 this.old_Specifications = old_Specifications;
                 this.MaterialName= MaterialName;
@@ -349,9 +349,9 @@ namespace BarCode.Web.Domain.Entitys
                 this.BarCode= MaterialBarCode;
                 this.MaterialNumber = number;
                 
-            }
+            
 
-            return Result.ReSuccess();
+                return Result.ReSuccess();
         }
     }
 }

src/BarCode.Web.Domain/Services/Public/MaterialService.cs

@@ -124,7 +124,7 @@ namespace BarCode.Web.Domain.Services
                 //修改有更新的数据
                 if (mats.Count != 0)
                 {
-                    var isFModifyDateMatNumbs = mats.Where(x => x.FModifyDate >= DateTime.Now.AddDays(-35)).Select(x => new { MaterialNumber = x.MaterialNumber, Specifications = x.Specifications, MaterialName = x.MaterialName, BarCode = x.BarCode, OrgId = x.OrgId, FCreateDate=x.FCreateDate, FModifyDate=x.FModifyDate, FProductLines1 = x.FProductLines1, FProductCATs1 = x.FProductCATs1, FMaterialGroup = x.FMaterialGroup, F_Product = x.F_Product, FProductLines1FName = x.FProductLines1FName, FProductCATs1FName = x.FProductCATs1FName, FMaterialGroupFName = x.FMaterialGroupFName, MaterialId = x.MaterialId, FProductIDS = x.FProductIDS, FDocumentStatus = x.FDocumentStatus }).ToList();
+                    var isFModifyDateMatNumbs = mats.Where(x => x.FModifyDate >= DateTime.Now.AddDays(-35)).Select(x => new { MaterialNumber = x.MaterialNumber, Specifications = x.Specifications, MaterialName = x.MaterialName, BarCode = x.BarCode, OrgId = x.OrgId, FCreateDate=x.FCreateDate, FModifyDate=x.FModifyDate, FProductLines1 = x.FProductLines1, FProductCATs1 = x.FProductCATs1, FMaterialGroup = x.FMaterialGroup, F_Product = x.F_Product, FProductLines1FName = x.FProductLines1FName, FProductCATs1FName = x.FProductCATs1FName, FMaterialGroupFName = x.FMaterialGroupFName, MaterialId = x.MaterialId, FProductIDS = x.FProductIDS, FDocumentStatus = x.FDocumentStatus, IdConvertBar=x.IdConvertBar }).ToList();
   
                     //
 
@@ -169,6 +169,7 @@ namespace BarCode.Web.Domain.Services
                                     //entity.FProductCATs1FName = mat.FProductCATs1FName;
                                     //entity.FMaterialGroupFName = mat.FMaterialGroupFName;
                                     entity.MaterialId = mat.MaterialId;
+                                    entity.IdConvertBar = mat.IdConvertBar;
                                     //entity.FProductIDS = mat.FProductIDS;
                                     continue;
                                 }

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

@@ -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);

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

@@ -847,14 +847,30 @@ namespace BarCode.Web.Domain.Services
                 return Result.ReFailure(ResultCodes.NoDateError);
             var serialNumbers = await _serialNumbersRepositories.GetEntityList(dto.SerialNumbers);
 
-            var exec_m = serialNumbers.Where(w => w.MaterialNumber == dto.MaterialNumber).Select(s => s.MaterialNumber).ToList();
+            //var exec_m = serialNumbers.Where(w => w.MaterialNumber == dto.MaterialNumber).Select(s => s.MaterialNumber).ToList();
-            if (exec_m.Count() > 0)
+            //if (exec_m.Count() > 0)
-                return Result.ReFailure($"序列号{string.Join(",", exec_m)}对应物料跟需要修改的物料一致", 611007);
+            //    return Result.ReFailure($"序列号{string.Join(",", exec_m)}对应物料跟需要修改的物料一致", 611007);
+            //修改物料
 
             //修改物料
             foreach (var s in serialNumbers)
             {
-                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));
+                foreach(var y in dto.specifications)
+                {
+                    if(s.SerialNumber==y.serialNumber)
+                    {
+                        s.old_Specifications=y.old_Specification;
+                    }
+                }
+
+            }
+
+            //修改物料
+            foreach (var s in serialNumbers)
+            {
+
+                //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));
+                var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialName(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialBarCode(materials, dto.MaterialNumber), s.old_Specifications);// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber));
                 if (!res.IsSuccess) return res;
             }
             generateRecord.UpdateMaterial();

src/BarCode.Web.Repositories/BoxRepositories.cs

@@ -240,7 +240,7 @@ namespace BarCode.Web.Repositories
                     query = query.Where(w => rec_code == w.box.OrgCode);
             }
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                query = query.Where(w => mNumber.Contains(w.detail.MaterialNumber));
+                query = query.Where(w => (mNumber.Contains(w.detail.MaterialNumber)||w.detail.Spec.Contains(dto.MaterialNumber)));
             if (!string.IsNullOrEmpty(dto.BoxBeginNo))
             {
                 //V01.05.00: 只输入一个框则只查输入值,不做区间查询

src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs

@@ -289,9 +289,9 @@ namespace BarCode.Web.Repositories
                     query = query.Where(w => rec_code == w.OrgCode);
             }
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                query = query.Where(w => (mNumber.Contains(w.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)));
+                query = query.Where(w => (mNumber.Contains(w.MaterialNumber)|| mSpec.Contains(w.Specifications) || w.Specifications.Contains(dto.MaterialNumber)));
-            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+            //if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                query = query.Where(w => (mSpec.Contains(w.Specifications)|| w.Specifications.Contains(dto.MaterialNumber)));
+                //query = query.Where(w => (mSpec.Contains(w.Specifications)|| w.Specifications.Contains(dto.MaterialNumber)));
 
 
 

src/BarCode.Web.Repositories/SecurityGenerateRecordRepositories.cs

@@ -265,10 +265,10 @@ namespace BarCode.Web.Repositories
             var list = await query.Select(s => new SecurityGenerateRecordInfoResponse()
             {
                 Id = s.Id,
-                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
+                Specifications = s.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
                 MaterialNumber = s.MaterialNumber,
-                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
+                MaterialName = s.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
-                BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber),
+                BarCode =s.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber),
                 LotNumber = s.LotNumber,
                 GenerateComplete = s.IsGenerateComplete == true ? "已完成" : "生成中",
                 Number = s.Number,

src/BarCode.Web.Repositories/SecurityNumbersRepositories.cs

@@ -193,7 +193,7 @@ namespace BarCode.Web.Repositories
                 Id = s.serial.Id,
                 GenerateRecordId = s.serial.GenerateRecordId,
                 SecurityNumber = s.serial.SecurityNumber,
-                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),
                 Number = s.sg == null ? 0 : s.sg.Number,
                 Creator = _singleDataService.GetSingleData(SingleAction.Users, companyId, s.serial.CreatorId),
                 CreateTime = s.serial.CreateTime.DateToStringSeconds(),

src/BarCode.Web.Repositories/SerialNumbersRepositories.cs

@@ -754,7 +754,7 @@ namespace BarCode.Web.Repositories
                 BoxId = s.serial.BoxId,
                 IsCarton = (s.serial.BoxId > 0 || s.serial.IsUse == true) ? true : false,
                 IsOldData = true,//扫箱号获取 默认就是老数据
-                Specifications = s.sg.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
+                Specifications =string.IsNullOrEmpty(s.serial.Specifications)? s.sg.Specifications: s.serial.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
                 MaterialNumber = s.serial.MaterialNumber,
                 MaterialName = s.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
                 BarCode = s.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber),