From a6aaad96f92dbf9c6ae2c81072509981cc97e6d7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 12月 2025 11:38:45 +0800
Subject: [PATCH] 消警处理
---
iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs | 251 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 216 insertions(+), 35 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs
index b794ae3..17e3f33 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs
@@ -43,7 +43,7 @@
/// 宸ヤ欢鍙�
/// </summary>
public string WorkPieceID { get; set; }
-
+
/// <summary>
/// 璁惧
/// </summary>
@@ -53,12 +53,12 @@
/// 璁惧鍚嶇О
/// </summary>
public string EquipmentName { get; set; }
-
+
/// <summary>
/// 宸ュ簭
/// </summary>
public string WorkingProcedure { get; set; }
-
+
/// <summary>
/// 璐ㄩ噺鐘舵��
/// </summary>
@@ -122,27 +122,27 @@
{
get
{
- if(string.IsNullOrEmpty(EquipmentID))
+ if (string.IsNullOrEmpty(EquipmentID))
{
return string.Empty;
}
- string qs = "";
- if(EquipmentID.Equals("EOP10"))
+ string qs = "";
+ if (EquipmentID.Equals("EOP10"))
{
if (string.IsNullOrEmpty(WorkingProcedure))
{
- return (string.IsNullOrEmpty(OP10QualityState)|| string.IsNullOrEmpty(OP40QualityState))?(GetQualityStateName(OP10QualityState)+ GetQualityStateName(OP40QualityState)): ((GetQualityStateName(OP10QualityState) +"|"+ GetQualityStateName(OP40QualityState)));
+ return (string.IsNullOrEmpty(OP10QualityState) || string.IsNullOrEmpty(OP40QualityState)) ? (GetQualityStateName(OP10QualityState) + GetQualityStateName(OP40QualityState)) : ((GetQualityStateName(OP10QualityState) + "|" + GetQualityStateName(OP40QualityState)));
}
if (WorkingProcedure.Equals("OP10"))
{
- qs=OP10QualityState;
+ qs = OP10QualityState;
}
else
{
qs = OP40QualityState;
}
}
- else if(EquipmentID.Equals("EOP20"))
+ else if (EquipmentID.Equals("EOP20"))
{
qs = OP20QualityState;
}
@@ -171,7 +171,7 @@
/// 鎿嶄綔鏂瑰紡
/// </summary>
public string QualityStateUpdateMode { get; set; }
-
+
/// <summary>
/// 鎿嶄綔浜�
/// </summary>
@@ -196,7 +196,7 @@
{
if (string.IsNullOrEmpty(WorkingProcedure))
{
- return OP10QualityReceiveTime.ToString()+ ((OP10QualityReceiveTime.HasValue&& OP40QualityReceiveTime.HasValue)?"|":"")+ OP40QualityReceiveTime.ToString();
+ return OP10QualityReceiveTime.ToString() + ((OP10QualityReceiveTime.HasValue && OP40QualityReceiveTime.HasValue) ? "|" : "") + OP40QualityReceiveTime.ToString();
}
if (WorkingProcedure.Equals("OP10"))
{
@@ -231,7 +231,7 @@
}
}
- private DateTime? m_EndTime=null;
+ private DateTime? m_EndTime = null;
/// <summary>
/// 涓嬬嚎鏃堕棿
/// </summary>
@@ -239,7 +239,7 @@
{
get
{
- if (m_EndTime.HasValue&& m_EndTime.Value.Date==DateTime.Parse("0001-01-01"))
+ if (m_EndTime.HasValue && m_EndTime.Value.Date == DateTime.Parse("0001-01-01"))
{
return null;
}
@@ -250,7 +250,7 @@
}
set { m_EndTime = value; }
}
-
+
/// <summary>
/// 杩炴潌鍘氬害;OP10/OP40
/// </summary>
@@ -261,7 +261,7 @@
/// 灏忓ご瀛旂洿寰�;OP20/OP60/OP80
/// </summary>
public string QualityOP20To1 { get; set; }
-
+
/// <summary>
/// 娑ㄦ柇鍔涚煩;OP30
/// </summary>
@@ -309,87 +309,87 @@
/// 琛鍘嬭鍔涚煩;OP30
/// </summary>
public string QualityOP30To6 { get; set; }
-
+
/// <summary>
/// 琛鍘嬭浣嶇Щ;OP30
/// </summary>
public string QualityOP30To7 { get; set; }
-
+
/// <summary>
/// 鍘嬭鍔涚煩;OP35
/// </summary>
public string QualityOP35To1 { get; set; }
-
+
/// <summary>
/// Y杞翠綅绉�;OP35
/// </summary>
public string QualityOP35To2 { get; set; }
-
+
/// <summary>
/// 澶уご瀛旂洿寰�;OP60/OP80
/// </summary>
public string QualityOP60To1 { get; set; }
-
+
/// <summary>
/// 鏍￠獙鐮佺粨鏋�;OP60
/// </summary>
public string QualityOP60To2 { get; set; }
-
+
/// <summary>
/// 娓呮礂娓╁害;OP70
/// </summary>
public string QualityOP70To1 { get; set; }
-
+
/// <summary>
/// 娓呮礂鍘嬪姏;OP70
/// </summary>
public string QualityOP70To2 { get; set; }
-
+
/// <summary>
/// 鍑哄彛澶勫伐浠舵俯搴�;OP70
/// </summary>
public string QualityOP70To3 { get; set; }
-
+
/// <summary>
/// 澶уご閲嶉噺;OP80
/// </summary>
public string QualityOP80To1 { get; set; }
-
+
/// <summary>
/// 灏忓ご閲嶉噺;OP80
/// </summary>
public string QualityOP80To2 { get; set; }
-
+
/// <summary>
/// 鎬婚噸;OP80
/// </summary>
public string QualityOP80To3 { get; set; }
-
+
/// <summary>
/// 寮洸;OP80
/// </summary>
public string QualityOP80To4 { get; set; }
-
+
/// <summary>
/// 鎵害;OP80
/// </summary>
public string QualityOP80To5 { get; set; }
-
+
/// <summary>
/// 澶уご鍨傜洿搴�;OP80
/// </summary>
public string QualityOP80To6 { get; set; }
-
+
/// <summary>
/// 澶уご瀛斿垎缁勭骇鍒�;OP80
/// </summary>
public string QualityOP80To7 { get; set; }
-
+
/// <summary>
/// 灏忓ご瀛斿垎缁勭骇鍒�;OP80
/// </summary>
public string QualityOP80To8 { get; set; }
-
+
/// <summary>
/// 閲嶉噺缁勫埆;OP80
/// </summary>
@@ -433,6 +433,40 @@
public string OP30QualityStateCH6 { get; set; }
+ public string OP30QualityStateCH3Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH3)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH3.ToString());
+ }
+ }
+ public string OP30QualityStateCH4Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH4)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH4.ToString());
+ }
+ }
+ public string OP30QualityStateCH5Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH5)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH5.ToString());
+ }
+ }
+ public string OP30QualityStateCH6Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH6)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH6.ToString());
+ }
+ }
+
+
public string OP30QualityState { get; set; }
public string OP35QualityState { get; set; }
@@ -442,11 +476,100 @@
public string OP80QualityState { get; set; }
+
+ #region 鏂板OP80鐨勪竴浜涜川閲忔暟鎹� 銆怑ditby shaocx,2024-06-13銆�
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-鍘氬害
+ /// </summary>
+ public string QualityOP80_Houdu { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-涓績璺�
+ /// </summary>
+ public string QualityOP80_ZXJ { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご瀛斿渾鏌卞害
+ /// </summary>
+ public string QualityOP80_DTKYZD { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰鍦嗗害
+ /// </summary>
+ public string QualityOP80_XTSMYD { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰鍦嗗害
+ /// </summary>
+ public string QualityOP80_XTXMYD { get; set; }
+
+
+ #region 澶уご瀛旂洿寰�
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご瀛旂洿寰�,澶уご瀛旂洿寰�=锛堝ぇ澶翠笂闈鏂瑰悜鐩村緞+澶уご涓婇潰Y鏂瑰悜鐩村緞+澶уご涓嬮潰X鏂瑰悜鐩村緞+澶уご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+ /// </summary>
+ public string QualityOP80_D_TKZJ { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご涓婇潰X鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_D_S_X { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご涓婇潰Y鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_D_S_Y { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご涓嬮潰X鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_D_X_X { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご涓嬮潰Y鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_D_X_Y { get; set; }
+
+ #endregion
+
+ #region 灏忓ご瀛旂洿寰�
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご瀛旂洿寰�,灏忓ご瀛旂洿寰�=锛堝皬澶翠笂闈鏂瑰悜鐩村緞+灏忓ご涓婇潰Y鏂瑰悜鐩村緞+灏忓ご涓嬮潰X鏂瑰悜鐩村緞+灏忓ご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+ /// </summary>
+ public string QualityOP80_X_TKZJ { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰X鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_X_S_X { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰Y鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_X_S_Y { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰X鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_X_X_X { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰Y鏂瑰悜鐩村緞
+ /// </summary>
+ public string QualityOP80_X_X_Y { get; set; }
+
+ #endregion
+
+ #endregion
+
/// <summary>
/// 澶囨敞
/// </summary>
public string Remarks { get; set; }
-
+
/// <summary>
/// Id涓婚敭
/// </summary>
@@ -455,7 +578,7 @@
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public DateTimeOffset ?CreatedTime { get; set; }
+ public DateTimeOffset? CreatedTime { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
@@ -500,7 +623,7 @@
/// 璐ㄩ噺鐘舵�佸悕绉�
/// </summary>
[Description("璐ㄩ噺鐘舵��")]
- public string QualityStateName{ get; set; }
+ public string QualityStateName { get; set; }
/// <summary>
/// 鎿嶄綔鏂瑰紡
@@ -1097,6 +1220,64 @@
[Description("娴嬮噺鏃堕棿")]
public string QualityReceiveTimeHand { get; set; }
+
+ #region 鏂板OP80鐨勪竴浜涜川閲忔暟鎹� 銆怑ditby shaocx,2024-06-13銆�
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-鍘氬害
+ /// </summary>
+ [Description("鍘氬害")]
+ public string QualityOP80_Houdu { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-涓績璺�
+ /// </summary>
+ [Description("涓績璺�")]
+ public string QualityOP80_ZXJ { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご瀛斿渾鏌卞害
+ /// </summary>
+ [Description("澶уご瀛斿渾鏌卞害")]
+ public string QualityOP80_DTKYZD { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓婇潰鍦嗗害
+ /// </summary>
+ [Description("灏忓ご涓婇潰鍦嗗害")]
+ public string QualityOP80_XTSMYD { get; set; }
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご涓嬮潰鍦嗗害
+ /// </summary>
+ [Description("灏忓ご涓嬮潰鍦嗗害")]
+ public string QualityOP80_XTXMYD { get; set; }
+
+
+ #region 澶уご瀛旂洿寰�
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-澶уご瀛旂洿寰�,澶уご瀛旂洿寰�=锛堝ぇ澶翠笂闈鏂瑰悜鐩村緞+澶уご涓婇潰Y鏂瑰悜鐩村緞+澶уご涓嬮潰X鏂瑰悜鐩村緞+澶уご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+ /// </summary>
+ [Description("澶уご瀛旂洿寰�")]
+ public string QualityOP80_D_TKZJ { get; set; }
+
+
+ #endregion
+
+ #region 灏忓ご瀛旂洿寰�
+
+ /// <summary>
+ /// OP80 璐ㄩ噺鏁版嵁-灏忓ご瀛旂洿寰�,灏忓ご瀛旂洿寰�=锛堝皬澶翠笂闈鏂瑰悜鐩村緞+灏忓ご涓婇潰Y鏂瑰悜鐩村緞+灏忓ご涓嬮潰X鏂瑰悜鐩村緞+灏忓ご涓嬮潰Y鏂瑰悜鐩村緞锛�/4
+ /// </summary>
+ [Description("灏忓ご瀛旂洿寰�")]
+ public string QualityOP80_X_TKZJ { get; set; }
+
+
+ #endregion
+
+ #endregion
+
/// <summary>
/// 澶уご閲嶉噺;OP80
/// </summary>
--
Gitblit v1.9.3