From dc63f19a6f555803239a696e56013963229ede5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Tue, 8 Jul 2025 10:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BF=BD=E6=BA=AFGP12?= =?UTF-8?q?=EF=BC=8C=E7=AE=B1=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/mes/pro/ProPackingDataBackService.cs | 8 ++++++++ 1 file changed, 8 insertions(+) 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