From 2c9aaa1be34405642c43c07c3049f2344c48d9f6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 18:24:45 +0800
Subject: [PATCH] 1
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 3 +++
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs | 8 ++++++++
iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs | 6 ++++++
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
index 2829c07..e12ddf4 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
@@ -3,6 +3,7 @@
using iWare.Wms.Core.Util.LowCode.Dto;
using System;
using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
namespace iWare.Wms.Application
{
@@ -26,6 +27,13 @@
/// </summary>
public class WorkPieceProcessOutput
{
+ [StringLength(50)]
+ public string DataCapturePointCname { get; set; }
+
+ [StringLength(50)]
+ public string UpdateDataCapturePointCname { get; set; }
+
+ public string UpdatedUserName { get; set; }
/// <summary>
/// 璐ㄩ噺涓嶅悎鏍煎師鍥犵被鍨嬶紝鏋氫妇QualityNoOkEnum 銆怑ditby shaocx,2024-06-26銆�
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 4a34b15..8d1f400 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -97,6 +97,9 @@
&& process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
select new WorkPieceProcessOutput
{
+ UpdatedUserName = process.UpdatedUserName,
+ DataCapturePointCname = process.DataCapturePointCname,
+ UpdateDataCapturePointCname = process.UpdateDataCapturePointCname,
QualityNoOk = process.QualityNoOk,
QualityNoOkReason = process.QualityNoOkReason,
Id = process.Id,
diff --git a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs
index db4a95a..499f638 100644
--- a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/WorkPieceProcess.cs
@@ -21,6 +21,12 @@
[Comment("宸ヤ欢鍔犲伐灞ュ巻琛�")]
public class WorkPieceProcess : DEntityBase
{
+ [StringLength(50)]
+ public string DataCapturePointCname { get; set; }
+
+ [StringLength(50)]
+ public string UpdateDataCapturePointCname { get; set; }
+
/// <summary>
/// 璐ㄩ噺涓嶅悎鏍煎師鍥犵被鍨嬶紝鏋氫妇QualityNoOkEnum 銆怑ditby shaocx,2024-06-26銆�
/// </summary>
--
Gitblit v1.9.3