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:27:14 +08:00
parent 28a4a51927
commit 7f3693e11c
7 changed files with 165 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DOAN.Service/MES/SmartScreen/Order/IService/IOrderSmartService.cs
View File

@@ -1,6 +1,6 @@
using DOAN.Model.MES.order;
using DOAN.Model.MES.order.Dto;
using DOAN.Model.MES.SmartScreen.Order;
using DOAN.Model.MES.SmartScreen.Order.Dto;
using Infrastructure.Attribute;
using Microsoft.AspNetCore.Http;
using System;
@@ -11,12 +11,14 @@ using System.Threading.Tasks;
namespace DOAN.Service.MES.SmartScreen.Order.IService
{
/// <summary>
/// 采购订单service接口
/// </summary>
public interface IOrderSmartService : IBaseService<OrderPurchase>
/// <summary>
/// 采购订单service接口
/// </summary>
public interface IOrderSmartService : IBaseService<OrderPurchase>
{
LargeScreenOrderDto GetLargeScreenOrder();
List<OrderProgressDto> GetOrderProgress();
}
}

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

@@ -8,16 +8,18 @@ using System.Text;
using System.Threading.Tasks;
using DOAN.Service.MES.SmartScreen.Order.IService;
using DOAN.Model.MES.order.Dto;
using DOAN.Model.MES.SmartScreen.Order;
using MathNet.Numerics.Distributions;
using NPOI.SS.Formula.Functions;
using DOAN.Model.MES.SmartScreen.Order.Dto;
using DOAN.Model.MES.product;
using DOAN.Model.MES.base_;
namespace DOAN.Service.MES.SmartScreen.Order
{
/// <summary>
/// 采购订单Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IOrderSmartService), ServiceLifetime = LifeTime.Transient)]
/// <summary>
/// 采购订单Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IOrderSmartService), ServiceLifetime = LifeTime.Transient)]
public class OrderSmartService : BaseService<OrderPurchase>, IOrderSmartService
{
@@ -41,5 +43,50 @@ namespace DOAN.Service.MES.SmartScreen.Order
largeScreenOrderDto.MonthCompletedOrderNum = response.Where(o => o.DeliveryDate >= firstDayOfMonth && o.DeliveryDate <= lastDayOfMonth && o.Orderindicator == 1).Count();
return largeScreenOrderDto;
}
public List<OrderProgressDto> GetOrderProgress()
{
var mainQuery = Queryable()
// 使用链式 Join 并明确指定别名和关联条件
.InnerJoin<ProWorkorder>((order, pw) => order.OrderNoMes == pw.CustomerOrder)
.InnerJoin<ProReportwork>((order, pw, pr) => pw.Workorder == pr.FkWorkorder)
.InnerJoin<BaseWorkProcesses>((order, pw, pr, bp) => pr.ProcessId == bp.Id)
// 按订单号分组
.GroupBy((order, pw, pr, bp) => order.OrderNoMes)
// 主查询字段选择
.Select((order, pw, pr, bp) => new OrderProgressDto
{
OrderNo = order.OrderNoMes,
MaterialName = order.MaterialName,
PlanNum = order.DemandQuantity,
// 保留子查询占位符，后续通过 SplitTable 填充
productionProcesses = new List<ProductionProcesses>()
});
// 子查询（获取工序明细）
var subQuery = Queryable()
.InnerJoin<ProWorkorder>((order, pw) => order.OrderNoMes == pw.CustomerOrder)
.InnerJoin<ProReportwork>((order, pw, pr) => pw.Workorder == pr.FkWorkorder)
.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
});
// 使用 Mapper 进行结果合并
var result = mainQuery.MergeTable() // 合并主查询
.Mapper(mainResult =>
{
// 根据 OrderNo 关联子查询
mainResult.productionProcesses = subQuery
.Where(sub => sub.OrderNo == mainResult.OrderNo)
.ToList();
}).ToList();
return result;
}
}
}