From 7041c9d71e8cfd5f2a376dae6a370c3e243553cf Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 4 Nov 2024 14:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/IPQC/QcDefectCollectionController.cs   |  4 ++--
 .../MES/quality/IPQC/Dto/QcDefectCollectionDto.cs  | 14 ++++++++++++++
 .../MES/quality/IPQC/QcDefectCollectionService.cs  |  2 +-
 DOAN.Service/MES/quality/IQC/QcReportService.cs    |  4 ++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/quality/IPQC/QcDefectCollectionController.cs b/DOAN.Admin.WebApi/Controllers/MES/quality/IPQC/QcDefectCollectionController.cs
index ac4871f..18dbf5a 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/quality/IPQC/QcDefectCollectionController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/quality/IPQC/QcDefectCollectionController.cs
@@ -140,8 +140,8 @@ namespace DOAN.WebApi.Controllers.MES.quality.IPQC
         }
         
         //TODO 获取所有供应商
-        [HttpGet("get_add_supplier")]
-        public IActionResult GetAddSupplier(string supplierCode)
+        [HttpGet("get_all_supplier")]
+        public IActionResult GetAllSupplier(string supplierCode)
         {
             var response = _QcDefectCollectionService.GetAllSuppliers(supplierCode);
 
diff --git a/DOAN.Model/MES/quality/IPQC/Dto/QcDefectCollectionDto.cs b/DOAN.Model/MES/quality/IPQC/Dto/QcDefectCollectionDto.cs
index 43d5419..d2414e0 100644
--- a/DOAN.Model/MES/quality/IPQC/Dto/QcDefectCollectionDto.cs
+++ b/DOAN.Model/MES/quality/IPQC/Dto/QcDefectCollectionDto.cs
@@ -103,5 +103,19 @@ namespace DOAN.Model.MES.quality.IPQC.Dto
         public string LineCode { get; set; }
 
         //public int? Tqm { get; set; }
+        
+        public string SupplierCode { get; set; }
+        
+        /// <summary>
+        /// 产品编码
+        /// </summary>
+       
+        public string ProductCode { get; set; }
+        
+        /// <summary>
+        /// 产品名称
+        /// </summary>
+      
+        public string ProductName { get; set; }
     }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/quality/IPQC/QcDefectCollectionService.cs b/DOAN.Service/MES/quality/IPQC/QcDefectCollectionService.cs
index 25a23e0..ae9e178 100644
--- a/DOAN.Service/MES/quality/IPQC/QcDefectCollectionService.cs
+++ b/DOAN.Service/MES/quality/IPQC/QcDefectCollectionService.cs
@@ -203,7 +203,7 @@ namespace DOAN.Service.MES.quality.IPQC
         {
            return Context.Queryable<BaseSupplier>()
                 .WhereIF(string.IsNullOrEmpty(supplier_str),it=>it.SupplierNo.Contains(supplier_str))
-                .Where(it=>it.Status == 1).ToList();
+                .Where(it=>it.Status == 1).Take(40).ToList();
         }
 
     }
diff --git a/DOAN.Service/MES/quality/IQC/QcReportService.cs b/DOAN.Service/MES/quality/IQC/QcReportService.cs
index 977d0f2..bcb29a4 100644
--- a/DOAN.Service/MES/quality/IQC/QcReportService.cs
+++ b/DOAN.Service/MES/quality/IQC/QcReportService.cs
@@ -29,7 +29,11 @@ namespace DOAN.Service.MES.quality.IQC
             var predicate = Expressionable.Create<QcDefectCollection>()
                 .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode))
                 .AndIF(!string.IsNullOrEmpty(parm.MaterialName), it => it.MaterialName.Contains(parm.MaterialName))
+                .AndIF(!string.IsNullOrEmpty(parm.ProductCode), it => it.ProductCode.Contains(parm.ProductCode))
+                .AndIF(!string.IsNullOrEmpty(parm.ProductName), it => it.ProductName.Contains(parm.ProductName))
                 .AndIF(!string.IsNullOrEmpty(parm.LineCode), it => it.LineCode.Contains(parm.LineCode))
+                .AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode.Contains(parm.SupplierCode))
+                
                 .AndIF(parm.DateTime != null && parm.DateTime > DateTime.MinValue.AddYears(1), it => it.DateTime == parm.DateTime)
                 .And(it => it.Tqm == 1||it.Tqm==2)
                 ;