diff --git a/ZR.Service/mes/pro/ProPackingDataBackService.cs b/ZR.Service/mes/pro/ProPackingDataBackService.cs index 050fd03c..17e5808a 100644 --- a/ZR.Service/mes/pro/ProPackingDataBackService.cs +++ b/ZR.Service/mes/pro/ProPackingDataBackService.cs @@ -333,6 +333,10 @@ namespace ZR.Service.mes.pro.IService predicate .And(it => it.PartNumber == parm.PartNumber) .And(it => it.WorkOrder == parm.WorkOrder) + .AndIF( + !string.IsNullOrEmpty(parm.PackingCode), + it => it.Label.Contains(parm.PackingCode) + ) .AndIF( parm.StartTime > DateTime.MinValue, it => it.CreatedTime >= parm.StartTime @@ -371,6 +375,10 @@ namespace ZR.Service.mes.pro.IService predicate .And(it => it.PartNumber == parm.PartNumber) .And(it => it.WorkOrder == parm.WorkOrder) + .AndIF( + !string.IsNullOrEmpty(parm.PackingCode), + it => it.Label.Contains(parm.PackingCode) + ) .AndIF( parm.StartTime > DateTime.MinValue, it => it.CreatedTime >= parm.StartTime