From bc42866b302006865a605da028a447592b5dbda9 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 11 6月 2024 15:04:36 +0800
Subject: [PATCH] 工序产量查询
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryYieldOutput.cs | 364 ++++++++++++++++++---------------------------------
1 files changed, 130 insertions(+), 234 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryYieldOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryYieldOutput.cs
index 17ceaf5..17d2490 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryYieldOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryYieldOutput.cs
@@ -10,153 +10,147 @@
/// <summary>
/// 浜ч噺鏌ヨ杈撳嚭鍙傛暟
/// </summary>
- public class QueryYieldOutput
+ public class QueryYieldOutput: ExportYieldOutput
{
- /// <summary>
- /// 宸ヤ欢鍙�
- /// </summary>
- public string WorkPieceID { get; set; }
-
- /// <summary>
- /// 鎴愬搧鐮�
- /// </summary>
- public virtual string OP80NewCode { get; set; }
-
- /// <summary>
- /// 褰撳墠宸ュ簭
- /// </summary>
- public string WorkingProcedureCurrent { get; set; }
-
/// <summary>
/// 褰撳墠璁惧
/// </summary>
public string EquipmentID { get; set; }
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- public string EquipmentName { get; set; }
+
- /// <summary>
- /// 宸ュ簭涓婄嚎鏃堕棿
- /// </summary>
- public DateTime? StartTime { get; set; }
+ ///// <summary>
+ ///// 宸ヤ欢鍙�
+ ///// </summary>
+ //public string WorkPieceID { get; set; }
- private DateTime? m_EndTime = null;
+ ///// <summary>
+ ///// 鎴愬搧鐮�
+ ///// </summary>
+ //public virtual string OP80NewCode { get; set; }
- /// <summary>
- /// 宸ュ簭涓嬬嚎鏃堕棿
- /// </summary>
- public DateTime? EndTime
- {
- get
- {
- if (m_EndTime == null)
- {
- return null;
- }
- if (m_EndTime == Convert.ToDateTime("0001-01-01"))
- {
- return null;
- }
- else
- {
- return m_EndTime;
- }
- }
- set { m_EndTime = value; }
- }
- /// <summary>
- /// 鍔犲伐鏃堕暱
- /// </summary>
- public string TimeSceonds
- {
- get
- {
- if (EndTime == null || StartTime == null || EndTime == Convert.ToDateTime("0001-01-01") || StartTime == Convert.ToDateTime("0001-01-01"))
- {
- return "";
- }
- TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);
- return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
- }
- }
- /// <summary>
- /// 璐ㄩ噺鐘舵��
- /// </summary>
- public int QualityState { get; set; }
- /// <summary>
- /// 璐ㄩ噺鐘舵�佸悕瀛�
- /// </summary>
- public string QualityStateName
- {
- get
- {
- if (1 == QualityState)
- {
- return "鍚堟牸";
+ //private DateTime? m_EndTime = null;
- }
- else if (2 == QualityState)
- {
+ ///// <summary>
+ ///// 宸ュ簭涓嬬嚎鏃堕棿
+ ///// </summary>
+ //public DateTime? EndTime
+ //{
+ // get
+ // {
- return "涓嶅悎鏍�";
- }
- else if (3 == QualityState)
- {
+ // if (m_EndTime == null)
+ // {
+ // return null;
+ // }
- return "鐤戜技";
- }
- else
- {
- return "";
- }
- }
- }
+ // if (m_EndTime == Convert.ToDateTime("0001-01-01"))
+ // {
+ // return null;
+ // }
+ // else
+ // {
+ // return m_EndTime;
+ // }
+ // }
+ // set { m_EndTime = value; }
+ //}
- /// <summary>
- /// 鎿嶄綔绫诲瀷锛圫PC/鐢熶骇锛�
- /// </summary>
- public string OperationType { get; set; }
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public string OperationTypeHand
- {
- get
- {
- string str = "";
- if (string.IsNullOrEmpty(OperationType))
- {
- str = "鍏朵粬";
- }
- else
- {
- str = OperationType;
- }
- return str;
- }
- }
- /// <summary>
- /// 璐ㄩ噺淇℃伅id
- /// </summary>
- public long QualityDataInfoID { get; set; }
+ ///// <summary>
+ ///// 鍔犲伐鏃堕暱
+ ///// </summary>
+ //public string TimeSceonds
+ //{
+ // get
+ // {
+ // if (EndTime == null || StartTime == null || EndTime == Convert.ToDateTime("0001-01-01") || StartTime == Convert.ToDateTime("0001-01-01"))
+ // {
+ // return "";
+ // }
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long Id { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string CreateUserName { get; set; }
+ // TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);
+
+ // return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
+ // }
+ //}
+
+ ///// <summary>
+ ///// 璐ㄩ噺鐘舵��
+ ///// </summary>
+ //public int QualityState { get; set; }
+
+ ///// <summary>
+ ///// 璐ㄩ噺鐘舵�佸悕瀛�
+ ///// </summary>
+ //public string QualityStateName
+ //{
+ // get
+ // {
+ // if (1 == QualityState)
+ // {
+ // return "鍚堟牸";
+
+ // }
+ // else if (2 == QualityState)
+ // {
+
+ // return "涓嶅悎鏍�";
+ // }
+ // else if (3 == QualityState)
+ // {
+
+ // return "鐤戜技";
+ // }
+ // else
+ // {
+ // return "";
+ // }
+ // }
+ //}
+
+ ///// <summary>
+ ///// 鎿嶄綔绫诲瀷锛圫PC/鐢熶骇锛�
+ ///// </summary>
+ //public string OperationType { get; set; }
+ ///// <summary>
+ ///// 鎿嶄綔绫诲瀷
+ ///// </summary>
+ //public string OperationTypeHand
+ //{
+ // get
+ // {
+ // string str = "";
+ // if (string.IsNullOrEmpty(OperationType))
+ // {
+ // str = "鍏朵粬";
+ // }
+ // else
+ // {
+ // str = OperationType;
+ // }
+ // return str;
+ // }
+ //}
+ ///// <summary>
+ ///// 璐ㄩ噺淇℃伅id
+ ///// </summary>
+ //public long QualityDataInfoID { get; set; }
+
+ ///// <summary>
+ ///// Id涓婚敭
+ ///// </summary>
+ //public long Id { get; set; }
+ ///// <summary>
+ ///// 鍒涘缓浜�
+ ///// </summary>
+ //public string CreateUserName { get; set; }
}
@@ -166,11 +160,11 @@
[Description("浜ч噺鏌ヨ")]
public class ExportYieldOutput
{
- /// <summary>
- /// 宸ヤ欢鍙�
- /// </summary>
- [Description("宸ヤ欢鍙�")]
- public string WorkPieceID { get; set; }
+ ///// <summary>
+ ///// 璁惧鍚嶇О
+ ///// </summary>
+ //[Description("褰撳墠璁惧")]
+ //public string EquipmentName { get; set; }
/// <summary>
/// 褰撳墠宸ュ簭
@@ -178,114 +172,16 @@
[Description("褰撳墠宸ュ簭")]
public string WorkingProcedureCurrent { get; set; }
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- [Description("璁惧鍚嶇О")]
- public string EquipmentName { get; set; }
+
/// <summary>
- /// 宸ュ簭涓婄嚎鏃堕棿
+ /// 浜ч噺姹囨�� 銆怑ditby shaocx,2024-06-11銆�
/// </summary>
- [Description("涓婄嚎鏃堕棿")]
- public string StartTime { get; set; }
-
- private string m_EndTime = "";
- /// <summary>
- /// 宸ュ簭涓嬬嚎鏃堕棿
- /// </summary>
- [Description("涓嬬嚎鏃堕棿")]
- public string EndTime
- {
- get
- {
- if (string.IsNullOrEmpty(m_EndTime))
- {
- return "";
- }
-
- if (m_EndTime.Contains("0001-01-01"))
- {
- return "";
- }
- else
- {
- return m_EndTime;
- }
- }
- set { m_EndTime = value; }
- }
-
- /// <summary>
- /// 鍔犲伐鏃堕暱
- /// </summary>
- [Description("鍔犲伐鏃堕暱")]
- public string TimeSceonds
- {
- get
- {
- if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
- {
- return "";
- }
-
- TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);
-
- return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
- }
- }
-
- /// <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>
- /// 鍒涘缓浜�
- /// </summary>
- [Description("鏁版嵁鏉ユ簮")]
- public string CreateUserName { get; set; }
+ [Description("浜ч噺")]
+ public int YieldCount { get; set; }
}
-
+
}
--
Gitblit v1.9.3