From 50633ae9c5a6226b323ac59f04e40206c6c3dfa1 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Tue, 14 Apr 2026 16:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BarCode.Web.Api/Controllers/TestController.cs      |  2 +-
 src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml       |  2 +-
 src/BarCode.Web.Core/Dto/Box/SaveBoxDetailsRequest.cs  |  2 +-
 src/BarCode.Web.Domain/Services/BoxService.cs          | 10 +++++-----
 .../SGenerateRecordRepositories.cs                     |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/BarCode.Web.Api/Controllers/TestController.cs b/src/BarCode.Web.Api/Controllers/TestController.cs
index 9f28b86..1151d20 100644
--- a/src/BarCode.Web.Api/Controllers/TestController.cs
+++ b/src/BarCode.Web.Api/Controllers/TestController.cs
@@ -162,7 +162,7 @@ namespace BarCode.Web.Api.Controllers
         }
 
         private async Task GetBox()
-        {
+        { 
             string[] arr = System.IO.File.ReadAllLines("E:\\1\\x.txt");
             var sList = GetS();
             //var sList = new List<SerialNumbers>();
diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
index 069b713..210cc99 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
@@ -631,7 +631,7 @@
             第二件装
             </summary>
         </member>
-        <member name="P:BarCode.Web.Core.Dto.Box.SaveBoxDetailsRequest.Spec">
+        <member name="P:BarCode.Web.Core.Dto.Box.SaveBoxDetailsRequest.Specifications">
             <summary>
             规格型号
             </summary>
diff --git a/src/BarCode.Web.Core/Dto/Box/SaveBoxDetailsRequest.cs b/src/BarCode.Web.Core/Dto/Box/SaveBoxDetailsRequest.cs
index 0383d65..1f38b33 100644
--- a/src/BarCode.Web.Core/Dto/Box/SaveBoxDetailsRequest.cs
+++ b/src/BarCode.Web.Core/Dto/Box/SaveBoxDetailsRequest.cs
@@ -31,7 +31,7 @@ namespace BarCode.Web.Core.Dto.Box
         /// </summary>
         /// 
         [Required(ErrorMessage = "物料规格不能为空")]
-        public string Spec { get; set; } = string.Empty;
+        public string Specifications { get; set; } = string.Empty;
 
 
 
diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs
index 62c687e..2ffd2e6 100644
--- a/src/BarCode.Web.Domain/Services/BoxService.cs
+++ b/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 => new { g.MaterialNumber, g.Spec }).Select(s => s.Key).ToList();
+            var materialNumbers = dto.Details.GroupBy(g => new { g.MaterialNumber, g.Specifications }).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.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 detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber) && f.Spec.Equals(m.Specifications));
+                var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Specifications.Equals(m.Specifications)).Select(s => s.SerialNumber).ToList();
+                var serialNumbersTwo = dto.Details.Where(w => w.MaterialNumber.Equals(m.MaterialNumber) && w.Specifications.Equals(m.Specifications)).Select(s => s.TwoSerialNumber).ToList();
                 var intCount = serialNumbers.Count();
                 s = serialNumbers;
                 serialNumbersTwo.RemoveAll(string.IsNullOrEmpty);
@@ -173,7 +173,7 @@ namespace BarCode.Web.Domain.Services
                         Qty = intCount,
                         //    SerialNumbers = serialNumbers
                         SerialNumbers = s,
-                        Spec=m.Spec
+                        Spec=m.Specifications
                     };
                     box.Details.Add(detail);
                 }
diff --git a/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs b/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs
index e03decb..949584c 100644
--- a/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs
+++ b/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));
+                query = query.Where(w => (mNumber.Contains(w.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)));
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                query = query.Where(w => (mSpec.Contains(w.Specifications)));
+                query = query.Where(w => (mSpec.Contains(w.Specifications)|| w.Specifications.Contains(dto.MaterialNumber)));