From d30d5e96380a8dd270832a856916e69fff79f12a Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 15 Nov 2024 14:11:53 +0800
Subject: [PATCH] 11

---
 DOAN.Model/MES/product/Dto/ProReportworkDto.cs   | 5 +++++
 DOAN.Service/MES/product/ProReportworkService.cs | 1 +
 2 files changed, 6 insertions(+)

diff --git a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
index 54ba7dd..0bba002 100644
--- a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
+++ b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
@@ -19,6 +19,11 @@ namespace DOAN.Model.MES.product.Dto
         public string LineCode { get; set; }
 
         public DateTime[]  TimeRange { get; set; }
+
+        /// <summary>
+        /// 仓库确认数
+        /// </summary>
+        public int  WarehouseconfirmationNum { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Service/MES/product/ProReportworkService.cs b/DOAN.Service/MES/product/ProReportworkService.cs
index ab3ccef..acb132b 100644
--- a/DOAN.Service/MES/product/ProReportworkService.cs
+++ b/DOAN.Service/MES/product/ProReportworkService.cs
@@ -42,6 +42,7 @@ namespace DOAN.Service.MES.product
                 .AndIF(!string.IsNullOrEmpty(parm.FkWorkorder), (w, r) => w.Workorder.Contains(parm.FkWorkorder))
                 .AndIF(!string.IsNullOrEmpty(parm.GroupCode), (w, r) => w.GroupCode == parm.GroupCode)
                 .AndIF(!string.IsNullOrEmpty(parm.LineCode), (w, r) => w.LineCode == parm.LineCode)
+                .AndIF(parm.WarehouseconfirmationNum>0,(w,r)=>r.QualifiedNumber>0)
                 .AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[0] > DateTime.MinValue, (w, r) => w.WorkorderDate >= parm.TimeRange[0])
                 .AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[1] > DateTime.MinValue, (w, r) => w.WorkorderDate <= parm.TimeRange[1])
                 ;