From b6a862ed65f3fd669d622241f45002ead9c8e330 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Tue, 10 Mar 2026 14:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=84=E6=A0=BC=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SGenerateRecordRepositories.cs            | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs b/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs
index f2b17f3..b3e9088 100644
--- a/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs
+++ b/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)|| mName.Contains(w.MaterialName)));
+
+
+
             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)