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/Dto/WorkPieceProcessOutput.cs | 243 +++++++++++++++++++++++++++++------------------
1 files changed, 149 insertions(+), 94 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 6dd3bee..ec82c6b 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,10 +27,37 @@
/// </summary>
public class WorkPieceProcessOutput
{
+
+ [StringLength(50)]
+ public string JiaJuGongWei { get; set; }
+ [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銆�
+ /// </summary>
+ public int? QualityNoOk { get; set; }
+
+ /// <summary>
+ /// 璐ㄩ噺涓嶅悎鏍煎師鍥� 銆怑ditby shaocx,2024-06-26銆�
+ /// </summary>
+ public string QualityNoOkReason { get; set; }
+
+
/// <summary>
/// 宸ヤ欢鍙�
/// </summary>
public string WorkPieceID { get; set; }
+
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ public virtual string OP80NewCode { get; set; }
/// <summary>
/// 褰撳墠宸ュ簭
@@ -174,119 +202,123 @@
/// </summary>
[Description("宸ヤ欢鍔犲伐杩芥函淇℃伅(宸ヤ欢+宸ュ簭)")]
public class WorkPieceProcessExcelOutput
+ {
+ /// <summary>
+ /// 宸ヤ欢鍙�
+ /// </summary>
+ [Description("宸ヤ欢鍙�")]
+ public string WorkPieceID { get; set; }
+
+ /// <summary>
+ /// 褰撳墠宸ュ簭
+ /// </summary>
+ [Description("褰撳墠宸ュ簭")]
+ public string WorkingProcedureCurrent { get; set; }
+
+ /// <summary>
+ /// 璁惧鍚嶇О
+ /// </summary>
+ [Description("璁惧鍚嶇О")]
+ public string EquipmentName { get; set; }
+
+ /// <summary>
+ /// 宸ュ簭涓婄嚎鏃堕棿
+ /// </summary>
+ [Description("涓婄嚎鏃堕棿")]
+ public string StartTime { get; set; }
+
+ private string m_EndTime = "";
+ /// <summary>
+ /// 宸ュ簭涓嬬嚎鏃堕棿
+ /// </summary>
+ [Description("涓嬬嚎鏃堕棿")]
+ public string EndTime
{
- /// <summary>
- /// 宸ヤ欢鍙�
- /// </summary>
- [Description("宸ヤ欢鍙�")]
- public string WorkPieceID { get; set; }
-
- /// <summary>
- /// 褰撳墠宸ュ簭
- /// </summary>
- [Description("褰撳墠宸ュ簭")]
- public string WorkingProcedureCurrent { get; set; }
-
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- [Description("璁惧鍚嶇О")]
- public string EquipmentName { get; set; }
-
- /// <summary>
- /// 宸ュ簭涓婄嚎鏃堕棿
- /// </summary>
- [Description("涓婄嚎鏃堕棿")]
- public string StartTime { get; set; }
-
- private string m_EndTime = "";
- /// <summary>
- /// 宸ュ簭涓嬬嚎鏃堕棿
- /// </summary>
- [Description("涓嬬嚎鏃堕棿")]
- public string EndTime
+ get
{
- get
+ if (string.IsNullOrEmpty(m_EndTime))
{
- if (string.IsNullOrEmpty(m_EndTime))
- {
- return "";
- }
-
- if (m_EndTime.Contains("0001-01-01"))
- {
- return "";
- }
- else
- {
- return m_EndTime;
- }
+ return "";
}
- set { m_EndTime = value; }
- }
- /// <summary>
- /// 鍔犲伐鏃堕暱
- /// </summary>
- [Description("鍔犲伐鏃堕暱")]
- public string TimeSceonds
- {
- get
+ if (m_EndTime.Contains("0001-01-01"))
{
- if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
- {
- return "";
- }
-
- TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);
-
- return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
+ return "";
+ }
+ else
+ {
+ return m_EndTime;
}
}
+ set { m_EndTime = value; }
+ }
- /// <summary>
- /// 璐ㄩ噺鐘舵��
- /// </summary>
- public int QualityState { get; set; }
- /// <summary>
- /// 璐ㄩ噺鐘舵�佸悕绉�
- /// </summary>
- [Description("璐ㄩ噺鐘舵��")]
- public string QualityStateName
+ /// <summary>
+ /// 鍔犲伐鏃堕暱
+ /// </summary>
+ [Description("鍔犲伐鏃堕暱")]
+ public string TimeSceonds
+ {
+ get
{
- get
+ if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
{
- if (1 == QualityState)
- {
- return "鍚堟牸";
+ return "";
+ }
- }
- else if (2 == QualityState)
- {
+ TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);
- return "涓嶅悎鏍�";
- }
- else if (3 == QualityState)
- {
+ return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
+ }
+ }
- return "鐤戜技";
- }
- else
- {
- return "";
- }
+ /// <summary>
+ /// 璐ㄩ噺鐘舵��
+ /// </summary>
+ public int QualityState { get; set; }
+ /// <summary>
+ /// 璐ㄩ噺鐘舵�佸悕绉�
+ /// </summary>
+ [Description("璐ㄩ噺鐘舵��")]
+ public string QualityStateName
+ {
+ get
+ {
+ if (1 == QualityState)
+ {
+ return "鍚堟牸";
+
+ }
+ else if (2 == QualityState)
+ {
+
+ return "涓嶅悎鏍�";
+ }
+ else if (3 == QualityState)
+ {
+
+ return "鐤戜技";
+ }
+ else
+ {
+ return "";
}
}
+ }
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ [Description("鎴愬搧鐮�")]
+ public string OP80NewCode { get; set; }
-
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long Id { get; set; }
+ /// <summary>
+ /// Id涓婚敭
+ /// </summary>
+ public long Id { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
- [Description("淇℃伅鏉ユ簮")]
+ [Description("鏁版嵁鏉ユ簮")]
public string CreateUserName { get; set; }
}
@@ -296,6 +328,16 @@
/// </summary>
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 榛勮壊
@@ -327,6 +369,12 @@
/// 宸ヤ欢鍙�
/// </summary>
public string WorkPieceID { get; set; }
+
+
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ public virtual string OP80NewCode { get; set; }
/// <summary>
/// 褰撳墠宸ュ簭
@@ -692,7 +740,7 @@
/// <summary>
/// 璐ㄩ噺鐘舵��
/// </summary>
- public int? QualityState { get; set; }
+ private int? QualityState { get; set; }
/// <summary>
/// 璐ㄩ噺鐘舵�佸悕瀛�
@@ -724,6 +772,13 @@
}
}
+
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ [Description("鎴愬搧鐮�")]
+ public string OP80NewCode { get; set; }
+
/// <summary>
/// Id涓婚敭
/// </summary>
--
Gitblit v1.9.3