From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
index 983544f..23a863c 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -104,6 +104,7 @@
select new WorkPieceProcessOutput
{
+ JiaJuGongWei = process.JiaJuGongWei,
UpdatedUserName = process.UpdatedUserName,
DataCapturePointCname = process.DataCapturePointCname,
UpdateDataCapturePointCname = process.UpdateDataCapturePointCname,
@@ -295,6 +296,7 @@
.Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.WorkPieceID.Contains(input.WorkPieceID))
.Where(!string.IsNullOrEmpty(input.workingProcedure), u => u.WorkingProcedure.Contains(input.workingProcedure))
.Where(!string.IsNullOrEmpty(input.createdUserName), u => u.CreatedUserName.Contains(input.createdUserName))
+ .Where(!string.IsNullOrEmpty(input.DataCapturePointCname), u => u.DataCapturePointCname.Contains(input.DataCapturePointCname))
.Where(!string.IsNullOrEmpty(input.PieceLogTypeName), u => u.PieceLogTypeName.Contains(input.PieceLogTypeName))
.Where(input.PieceLogType != null, u => u.PieceLogType == input.PieceLogType)
.Where(!string.IsNullOrEmpty(input.remarks), u => u.Remarks.Contains(input.remarks))
--
Gitblit v1.9.3