Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

订单大屏

Browse Source
This commit is contained in:
卢江海
2025-03-26 17:54:41 +08:00
parent 7f3693e11c
commit 0e6a49471f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DOAN.Model/MES/SmartScreen/Order/Dto/OrderProgressDto.cs
View File

@@ -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

6
DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs
View File

@@ -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() // 合并主查询