From 0e6a49471f003eef52cda6a601e7148756d36bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E6=B1=9F=E6=B5=B7?= <18360817963@163.com>
Date: Wed, 26 Mar 2025 17:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/SmartScreen/Order/Dto/OrderProgressDto.cs | 7 ++++++-
 DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs  | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/DOAN.Model/MES/SmartScreen/Order/Dto/OrderProgressDto.cs b/DOAN.Model/MES/SmartScreen/Order/Dto/OrderProgressDto.cs
index b581e1f..6f90778 100644
--- a/DOAN.Model/MES/SmartScreen/Order/Dto/OrderProgressDto.cs
+++ b/DOAN.Model/MES/SmartScreen/Order/Dto/OrderProgressDto.cs
@@ -23,10 +23,15 @@ namespace DOAN.Model.MES.SmartScreen.Order.Dto
 		/// </summary>
 		public int? PlanNum { get; set; }
 
+		/// <summary>
+		/// 完成数量
+		/// </summary>
+		public int? FinishNum { get; set; }
+
 		/// <summary>
 		/// 工序集合
 		/// </summary>
-        public List<ProductionProcesses> productionProcesses { get; set; }
+		public List<ProductionProcesses> productionProcesses { get; set; }
     }
 
 	public class ProductionProcesses 
diff --git a/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs
index c8610e8..6eb257f 100644
--- a/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs
+++ b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs
@@ -51,7 +51,7 @@ namespace DOAN.Service.MES.SmartScreen.Order
 			var mainQuery = Queryable()
 				// 使用链式 Join 并明确指定别名和关联条件
 				.InnerJoin<ProWorkorder>((order, pw) => order.OrderNoMes == pw.CustomerOrder)
-				.InnerJoin<ProReportwork>((order, pw, pr) => pw.Workorder == pr.FkWorkorder)
+				.InnerJoin<ProReportwork01>((order, pw, pr) => pw.Workorder == pr.Workorder)
 				.InnerJoin<BaseWorkProcesses>((order, pw, pr, bp) => pr.ProcessId == bp.Id)
 				// 按订单号分组
 				.GroupBy((order, pw, pr, bp) => order.OrderNoMes)
@@ -68,13 +68,13 @@ namespace DOAN.Service.MES.SmartScreen.Order
 			// 子查询（获取工序明细）
 			var subQuery = Queryable()
 				.InnerJoin<ProWorkorder>((order, pw) => order.OrderNoMes == pw.CustomerOrder)
-				.InnerJoin<ProReportwork>((order, pw, pr) => pw.Workorder == pr.FkWorkorder)
+				.InnerJoin<ProReportwork01>((order, pw, pr) => pw.Workorder == pr.Workorder)
 				.InnerJoin<BaseWorkProcesses>((order, pw, pr, bp) => pr.ProcessId == bp.Id)
 				.Select((order, pw, pr, bp) => new ProductionProcesses
 				{
 					OrderNo = order.OrderNoMes, // 必须包含关联字段
 					ProcessName = bp.Name,
-					Num = pr.FinishedNum
+					Num = pr.FinishNum
 				});
 			// 使用 Mapper 进行结果合并
 			var result = mainQuery.MergeTable() // 合并主查询