From 0240b3c4b808b93b88cb4f97f45d2475f6001429 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 28 8月 2024 17:41:05 +0800
Subject: [PATCH] 2
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 3 +++
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs | 10 ++++++++++
iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml | 10 ++++++++++
3 files changed, 23 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 20385cb..2829c07 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
@@ -318,6 +318,16 @@
public class WorkPieceInfoMachiningPageOutput
{
/// <summary>
+ /// 璐ㄩ噺涓嶅悎鏍煎師鍥犵被鍨嬶紝鏋氫妇QualityNoOkEnum 銆怑ditby shaocx,2024-06-26銆�
+ /// </summary>
+ public int? QualityNoOk { get; set; }
+
+ /// <summary>
+ /// 璐ㄩ噺涓嶅悎鏍煎師鍥� 銆怑ditby shaocx,2024-06-26銆�
+ /// </summary>
+ public string QualityNoOkReason { get; set; }
+
+ /// <summary>
/// 棰滆壊绫诲瀷
/// 妫�娴嬪伐浠讹細 1 榛勮壊
///姝ｅ父宸ヤ欢锛�2 缁胯壊
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 10079e9..e7ea152 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -356,7 +356,10 @@
.Where(o => o.f.e.a.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : o.f.e.a.QualityState))
.Select(s => new WorkPieceInfoMachiningPageOutput
{
+ QualityNoOk = s.f.e.a.QualityNoOk,
+ QualityNoOkReason = s.f.e.a.QualityNoOkReason,
Id = s.f.e.a.Id,
+
WorkPieceID = s.f.e.a.WorkPieceID,
WorkPieceState = s.f.e.a.WorkPieceState,
WorkPieceStateName = s.f.f.Value,
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
index eab78d6..ce2aa13 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
+++ b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -15418,6 +15418,16 @@
宸ヤ欢鍔犲伐杩芥函杈撳嚭鍙傛暟
</summary>
</member>
+ <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.QualityNoOk">
+ <summary>
+ 璐ㄩ噺涓嶅悎鏍煎師鍥犵被鍨嬶紝鏋氫妇QualityNoOkEnum 銆怑ditby shaocx,2024-06-26銆�
+ </summary>
+ </member>
+ <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.QualityNoOkReason">
+ <summary>
+ 璐ㄩ噺涓嶅悎鏍煎師鍥� 銆怑ditby shaocx,2024-06-26銆�
+ </summary>
+ </member>
<member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.CololType">
<summary>
棰滆壊绫诲瀷
--
Gitblit v1.9.3