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

代码调整

Browse Source
This commit is contained in:
git_rabbit
2026-02-02 19:14:22 +08:00
parent cc88e78231
commit 3f8b6c3ea9
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
View File

@@ -9,6 +9,7 @@ namespace DOAN.Model.MES.product.Dto
public string productionCode { get; set; } public string productionCode { get; set; }
public string MaterialCode { get; set; }
public string Workorder { get; set; } public string Workorder { get; set; }
public string RouteCode { get; set; } public string RouteCode { get; set; }

3
DOAN.Service/MES/Order/OrderPurchaseService.cs
View File

@@ -68,7 +68,8 @@ namespace DOAN.Service.MES.order
var response = Queryable() var response = Queryable()
.Where(predicate.ToExpression()) .Where(predicate.ToExpression())
.OrderBy(it=> it.OrderNoMes) .OrderByDescending(it => it.OrderNoMes)
//.OrderBy(it => it.OrderNoMes)
.ToPage<OrderPurchase, OrderPurchaseDto>(parm); .ToPage<OrderPurchase, OrderPurchaseDto>(parm);
return response; return response;

12
DOAN.Service/MES/Product/ProWorkorderQueryService.cs
View File

@@ -43,6 +43,12 @@ namespace DOAN.Service.MES.product
!string.IsNullOrEmpty(parm.productionCode), !string.IsNullOrEmpty(parm.productionCode),
it => it.productionCode.Contains(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( .AndIF(
!string.IsNullOrEmpty(parm.FeedOrder), !string.IsNullOrEmpty(parm.FeedOrder),
it => it.FeedOrder.Contains(parm.FeedOrder) it => it.FeedOrder.Contains(parm.FeedOrder)
@@ -96,6 +102,12 @@ namespace DOAN.Service.MES.product
!string.IsNullOrEmpty(parm.productionCode), !string.IsNullOrEmpty(parm.productionCode),
it => it.productionCode.Contains(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( .AndIF(
!string.IsNullOrEmpty(parm.FeedOrder), !string.IsNullOrEmpty(parm.FeedOrder),
it => it.FeedOrder.Contains(parm.FeedOrder) it => it.FeedOrder.Contains(parm.FeedOrder)