From 58606767086bb990df3a8bdf31e9963487343553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Wed, 3 Jul 2024 17:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs | 1 + ZR.Service/mes/pro/WmPackingrecordService.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs b/ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs index 52c6687f..c1f017ac 100644 --- a/ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs +++ b/ZR.Model/MES/pro/DTO/WmPackingrecordDto.cs @@ -11,6 +11,7 @@ namespace ZR.Model.MES.pro.DTO public string Machine { get; set; } public string WorkOrderNum { get; set; } + public string PackingCode { get; set; } public DateTime? start_time { get; set; } public DateTime? end_time { get; set; } diff --git a/ZR.Service/mes/pro/WmPackingrecordService.cs b/ZR.Service/mes/pro/WmPackingrecordService.cs index bebd5e0c..aec82f50 100644 --- a/ZR.Service/mes/pro/WmPackingrecordService.cs +++ b/ZR.Service/mes/pro/WmPackingrecordService.cs @@ -25,6 +25,7 @@ namespace ZR.Service.mes.pro.IService predicate.AndIF(!string.IsNullOrEmpty(parm.PartNum), it => it.PartNum == parm.PartNum) .AndIF(!string.IsNullOrEmpty(parm.Machine), it => it.Machine == parm.Machine) .AndIF(!string.IsNullOrEmpty(parm.WorkOrderNum), it => it.WorkOrderNum == parm.WorkOrderNum) + .AndIF(!string.IsNullOrEmpty(parm.PackingCode), it => it.PackingCode.Contains(parm.PackingCode)) .AndIF(parm.start_time > new DateTime(2021, 1, 1), it => it.CreateTime >= parm.start_time) .AndIF(parm.end_time > new DateTime(2021, 1, 1), it => it.CreateTime <= parm.end_time);