修改测试

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

@@ -631,6 +631,12 @@
             第二件装
             </summary>
         </member>
+        <member name="P:BarCode.Web.Core.Dto.Box.SaveBoxDetailsRequest.Spec">
+            <summary>
+            规格型号
+            </summary>
+            
+        </member>
         <member name="T:BarCode.Web.Core.Dto.Box.SaveBoxRequest">
             <summary>
             保存箱信息(装箱保存,完成装箱)

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

@@ -136,6 +136,11 @@
             物料编码
             </summary>
         </member>
+        <member name="P:BarCode.Web.Domain.Entitys.BoxDetails.Spec">
+            <summary>
+            物料规格
+            </summary>
+        </member>
         <member name="P:BarCode.Web.Domain.Entitys.BoxDetails.Qty">
             <summary>
             数量（装箱数量）

src/BarCode.Web.Core/Dto/Box/SaveBoxDetailsRequest.cs

@@ -26,6 +26,14 @@ namespace BarCode.Web.Core.Dto.Box
         /// 第二件装
         /// </summary>
         public string TwoSerialNumber { get; set; } = string.Empty;
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        /// 
+        [Required(ErrorMessage = "物料规格不能为空")]
+        public string Spec { get; set; } = string.Empty;
+
+
 
     }
 }

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

@@ -30,6 +30,14 @@ namespace BarCode.Web.Domain.Entitys
         /// </summary>
         [Column("MaterialNumber")]
         public string MaterialNumber { get; set; } = "";
+
+
+        /// <summary>
+        /// 物料规格
+        /// </summary>
+        [Column("Spec")]
+        public string Spec { get; set; } = "";
+
         /// <summary>
         /// 数量（装箱数量）
         /// </summary>
@@ -40,6 +48,9 @@ namespace BarCode.Web.Domain.Entitys
         /// </summary>
         [Column("SerialNumbers")]
         public List<string> SerialNumbers { get; set; } = new List<string>();
+
+
+
         ///// <summary>
         ///// 是否计数
         ///// </summary>

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

@@ -128,15 +128,15 @@ namespace BarCode.Web.Domain.Services
             var resCarton = box.Carton(dto.IsCarton, loginInfo.UserInfo.UcId);
             if (!resCarton.IsSuccess) return resCarton;
 
-            var materialNumbers = dto.Details.GroupBy(g => g.MaterialNumber).Select(s => s.Key).ToList();
+            var materialNumbers = dto.Details.GroupBy(g => new { g.MaterialNumber, g.Spec }).Select(s => s.Key).ToList();
             
             foreach (var m in materialNumbers)
             {
                 List<string> s=[null];
                 s.Clear();
-                var detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m));
-                var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m)).Select(s => s.SerialNumber).ToList();
-                var serialNumbersTwo = dto.Details.Where(w => w.MaterialNumber.Equals(m)).Select(s => s.TwoSerialNumber).ToList();
+                var detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber) && f.Spec.Equals(m.Spec));
+                var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Spec.Equals(m.Spec)).Select(s => s.SerialNumber).ToList();
+                var serialNumbersTwo = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Spec.Equals(m.Spec)).Select(s => s.TwoSerialNumber).ToList();
                 var intCount = serialNumbers.Count();
                 s = serialNumbers;
                 serialNumbersTwo.RemoveAll(string.IsNullOrEmpty);
@@ -168,11 +168,12 @@ namespace BarCode.Web.Domain.Services
                 {
                     detail = new BoxDetails()
                     {
-                        MaterialNumber = m,
+                        MaterialNumber = m.MaterialNumber,
                         // Qty = serialNumbers.Count(),
                         Qty = intCount,
                         //    SerialNumbers = serialNumbers
-                        SerialNumbers = s
+                        SerialNumbers = s,
+                        Spec=m.Spec
                     };
                     box.Details.Add(detail);
                 }

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

@@ -182,12 +182,12 @@ namespace BarCode.Web.Domain.Services.Public
                         else
                         {
                             var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-                            _logger.LogInformation($"物料拉取-开始时间（２０２６０２１２）：{beginTime}");
+                            _logger.LogInformation($"物料拉取-开始时间（２０２６０407）：{beginTime}");
                             //组装dto
                             var erp_materials_list = mats.Select(x => _mapper.Map<ErpMaterialDto>(x)).ToList();
                             _memoryCache.Set(_erpOptions.cache_materail_key, erp_materials_list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(DateTimeUtil.GetTotalMinutesTimeSpan())));
                             var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-                            _logger.LogInformation($"物料拉取-结束时间（２０２６０２１２）：{endTime}");
+                            _logger.LogInformation($"物料拉取-结束时间（２０２６０407）：{endTime}");
                             return ResultList<ErpMaterialDto>.ReSuccess(erp_materials_list);
                         }
 

src/BarCode.Web.Repositories/BoxRepositories.cs

@@ -289,7 +289,7 @@ namespace BarCode.Web.Repositories
                 Id = s.box.Id,
                 DetailId = s.detail == null ? 0 : s.detail.Id,
                 BoxBillNo = s.box.BoxBillNo,
-                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail == null ? "" : s.detail.MaterialNumber),
+                Specifications =s.detail==null?"":s.detail.Spec ,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail == null ? "" : s.detail.MaterialNumber),
                 MaterialNumber = s.detail == null ? "" : s.detail.MaterialNumber,
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail == null ? "" : s.detail.MaterialNumber),
                 BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.detail == null ? "" : s.detail.MaterialNumber),