From 429923d78ca4a016ab86adf30d189eb0e7774925 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 18:11:58 +0800
Subject: [PATCH] 日志类型优化
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs | 12 +++++++-----
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 1 +
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs | 6 ++++++
iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs | 6 ++++++
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
index 6fd9956..c6a38a6 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
@@ -62,12 +62,16 @@
- [Description("澶囨敞")]
- public string Remarks { get; set; }
+ //[Description("澶囨敞")]
+ //public string Remarks { get; set; }
- [Description("鍒涘缓浜�")]
+ [Description("鏉ユ簮")]
+ public string DataCapturePointCname { get; set; }
+
+
+ [Description("鏉ユ簮浠ｇ爜")]
public virtual string CreatedUserName { get; set; }
/// <summary>
@@ -75,8 +79,6 @@
/// </summary>
[Description("鍒涘缓鏃堕棿")]
public virtual DateTimeOffset? CreatedTime { get; set; }
-
-
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs
index f6d7162..341686d 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceLogYieldInput.cs
@@ -1,6 +1,7 @@
锘縰sing iWare.Wms.Core;
using iWare.Wms.Core.Service;
using Microsoft.EntityFrameworkCore;
+using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace iWare.Wms.Application
@@ -48,6 +49,11 @@
/// </summary>
public virtual string workingProcedure { get; set; }
+
+
+ [Description("鏉ユ簮")]
+ public string DataCapturePointCname { get; set; }
+
public virtual string createdUserName { get; set; }
public virtual string remarks { get; set; }
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..edf7a6d 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -295,6 +295,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))
diff --git a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs
index b002e8a..4eb394b 100644
--- a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceLog.cs
@@ -16,6 +16,12 @@
[Comment("宸ヤ欢鎺ユ敹淇℃伅灞ュ巻琛�")]
public class WorkPieceLog : DEntityBase
{
+
+ /// <summary>
+ /// 鏁版嵁鏉ユ簮
+ /// </summary>
+ public string DataCapturePointCname { get; set; }
+
/// <summary>
/// 宸ヤ欢鍙�
/// </summary>
--
Gitblit v1.9.3