From 3f8b6c3ea9b6ccc44cc79f62d987835965303008 Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Mon, 2 Feb 2026 19:14:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs | 1 + DOAN.Service/MES/Order/OrderPurchaseService.cs | 3 ++- DOAN.Service/MES/Product/ProWorkorderQueryService.cs | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs index 071f267..a59283b 100644 --- a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs +++ b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs @@ -9,6 +9,7 @@ namespace DOAN.Model.MES.product.Dto public string productionCode { get; set; } + public string MaterialCode { get; set; } public string Workorder { get; set; } public string RouteCode { get; set; } diff --git a/DOAN.Service/MES/Order/OrderPurchaseService.cs b/DOAN.Service/MES/Order/OrderPurchaseService.cs index 1d5f789..749c2b1 100644 --- a/DOAN.Service/MES/Order/OrderPurchaseService.cs +++ b/DOAN.Service/MES/Order/OrderPurchaseService.cs @@ -68,7 +68,8 @@ namespace DOAN.Service.MES.order var response = Queryable() .Where(predicate.ToExpression()) - .OrderBy(it=> it.OrderNoMes) + .OrderByDescending(it => it.OrderNoMes) + //.OrderBy(it => it.OrderNoMes) .ToPage(parm); return response; diff --git a/DOAN.Service/MES/Product/ProWorkorderQueryService.cs b/DOAN.Service/MES/Product/ProWorkorderQueryService.cs index 2452a77..e6f4912 100644 --- a/DOAN.Service/MES/Product/ProWorkorderQueryService.cs +++ b/DOAN.Service/MES/Product/ProWorkorderQueryService.cs @@ -43,6 +43,12 @@ namespace DOAN.Service.MES.product !string.IsNullOrEmpty(parm.productionCode), it => it.productionCode.Contains(parm.productionCode) ) + .AndIF( + !string.IsNullOrEmpty(parm.MaterialCode), + it => + it.productionCode.Contains(parm.MaterialCode) + || it.MaterialCode.Contains(parm.MaterialCode) + ) .AndIF( !string.IsNullOrEmpty(parm.FeedOrder), it => it.FeedOrder.Contains(parm.FeedOrder) @@ -96,6 +102,12 @@ namespace DOAN.Service.MES.product !string.IsNullOrEmpty(parm.productionCode), it => it.productionCode.Contains(parm.productionCode) ) + .AndIF( + !string.IsNullOrEmpty(parm.MaterialCode), + it => + it.productionCode.Contains(parm.MaterialCode) + || it.MaterialCode.Contains(parm.MaterialCode) + ) .AndIF( !string.IsNullOrEmpty(parm.FeedOrder), it => it.FeedOrder.Contains(parm.FeedOrder)