From f6cf046da744a406ff4ef4eb76408fc8c9ab253a Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 15 Nov 2024 16:34:34 +0800
Subject: [PATCH] 1

---
 DOAN.Model/MES/product/Dto/ProReportworkDto.cs  | 17 ++++++++++++-----
 .../MES/product/ProReportworkService.cs         |  8 ++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
index 00c7908..ca14d9c 100644
--- a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
+++ b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
@@ -20,10 +20,12 @@ namespace DOAN.Model.MES.product.Dto
 
         public DateTime[]  TimeRange { get; set; }
 
+        public int Status { get; set; }
+
         /// <summary>
         /// 仓库确认数
         /// </summary>
-        public int  WarehouseconfirmationNum { get; set; }
+        public int?  WarehouseconfirmationNum { get; set; }
     }
 
     /// <summary>
@@ -43,19 +45,24 @@ namespace DOAN.Model.MES.product.Dto
         public string ProductionCode { get; set; }
         public string ProductionName { get; set; }
 
+
         public string Specification { get; set; }
 
         public string GroupCode { get; set; }
 
         public string LineCode { get; set; }
 
-        public int QualifiedNumber { get; set; }
+        public int? QualifiedNumber { get; set; }
 
-        public int UnqualifiedNumber { get; set; }
 
-        public int ReworkNumber { get; set; }
+        // 报告数和仓库确认数 差异
+        public int  Difference { get; set; }
 
-        public int ScrapNumber { get; set; }
+        public int? UnqualifiedNumber { get; set; }
+
+        public int? ReworkNumber { get; set; }
+
+        public int? ScrapNumber { get; set; }
 
         public string Remark { get; set; }
 
diff --git a/DOAN.Service/MES/product/ProReportworkService.cs b/DOAN.Service/MES/product/ProReportworkService.cs
index 81958db..46dad65 100644
--- a/DOAN.Service/MES/product/ProReportworkService.cs
+++ b/DOAN.Service/MES/product/ProReportworkService.cs
@@ -45,6 +45,8 @@ namespace DOAN.Service.MES.product
                 .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])
+                
+                .AndIF(parm.Status>0,(w,r) => w.Status == parm.Status)
                 ;
 
 
@@ -57,6 +59,12 @@ namespace DOAN.Service.MES.product
                      ProductionCode=w.ProductionCode,
                      ProductionName=w.ProductionName,
                      Specification=w.Specification,
+                     QualifiedNumber = r.QualifiedNumber,
+                     UnqualifiedNumber = r.UnqualifiedNumber,
+                     ReworkNumber = r.ReworkNumber,
+                     ScrapNumber=r.ScrapNumber,
+                     Remark=r.Remark,
+                     Difference = r.QualifiedNumber-r.FinishedNum??0,
                      FkWorkorder =w.Workorder,
                      GroupCode = w.GroupCode,
                      LineCode = w.LineCode,