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-07 18:16:21 +08:00
parent a9b59678de
commit bfc0f27b18
6 changed files with 150 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,10 @@ namespace DOAN.Service.MES.product
parm.WorkorderDate[0] = parm.WorkorderDate[0].Date;
parm.WorkorderDate[1] = parm.WorkorderDate[1].Date;
}
bool hasWorkorder = !string.IsNullOrEmpty(parm.Workorder);
var predicate = Expressionable
.Create<ProWorkorder>()
.And(it => it.PlanNum > 0)
.AndIF(hasWorkorder, it => it.Workorder.Contains(parm.Workorder))
.AndIF(
!string.IsNullOrEmpty(parm.productionName),
it => it.productionName.Contains(parm.productionName)
@@ -60,7 +60,7 @@ namespace DOAN.Service.MES.product
.AndIF(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode == parm.RouteCode)
.AndIF(!string.IsNullOrEmpty(parm.GroupCode), it => it.GroupCode == parm.GroupCode)
.AndIF(
parm.WorkorderDate != null && parm.WorkorderDate.Length > 0,
(parm.WorkorderDate != null && parm.WorkorderDate.Length > 0) && !hasWorkorder,
it =>
it.WorkorderDate >= parm.WorkorderDate[0]
&& it.WorkorderDate <= parm.WorkorderDate[1]
@@ -91,7 +91,7 @@ namespace DOAN.Service.MES.product
parm.WorkorderDate[0] = parm.WorkorderDate[0].Date;
parm.WorkorderDate[1] = parm.WorkorderDate[1].Date;
}
bool hasWorkorder = !string.IsNullOrEmpty(parm.Workorder);
var predicate = Expressionable
.Create<ProWorkorder>()
.AndIF(
@@ -119,11 +119,12 @@ namespace DOAN.Service.MES.product
.AndIF(!string.IsNullOrEmpty(parm.RouteCode), it => it.RouteCode == parm.RouteCode)
.AndIF(!string.IsNullOrEmpty(parm.GroupCode), it => it.GroupCode == parm.GroupCode)
.AndIF(
parm.WorkorderDate != null && parm.WorkorderDate.Length > 0,
(parm.WorkorderDate != null && parm.WorkorderDate.Length > 0) && !hasWorkorder,
it =>
it.WorkorderDate >= parm.WorkorderDate[0]
&& it.WorkorderDate <= parm.WorkorderDate[1]
)
.AndIF(hasWorkorder, it => it.Workorder.Contains(parm.Workorder))
.And(it => it.PlanNum > 0)
.ToExpression();