From 09a12e1094e90fe83c5578de64b56e9237c60507 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 14:13:33 +0800
Subject: [PATCH] 代码回归
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs | 210 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 184 insertions(+), 26 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
index ec37788..0f3ac9a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
@@ -12,6 +12,11 @@
[NotMapped]
public class WorkPieceLogMiddle : WorkPieceLog
{
+ /// <summary>
+ /// OP80鑾峰彇QC鏁版嵁鏍囪,0琛ㄧず寰呰幏鍙栵紝1琛ㄧず鑾峰彇鎴愬姛锛�2琛ㄧず鑾峰彇澶辫触 銆怑ditby shaocx,2024-06-15銆�
+ /// </summary>
+ public int? GetQcDataFlag { get; set; }
+
#region SPC,NOOK 鎺ㄥ嚭澶氫欢 OP20锛孫P50锛孫P60
public string WorkPieceIDA { get; set; }
public string WorkPieceIDB { get; set; }
@@ -166,17 +171,26 @@
public bool OP35NOOK { get; set; }
#endregion
+ #region OP60鍝釜宸ヤ綅鏍囪锛圓銆丅銆丆銆丏锛夈�怑ditby shaocx,2024-06-07銆�
+
+ /// <summary>
+ /// OP60鍝釜宸ヤ綅鏍囪锛圓銆丅銆丆銆丏锛�
+ /// </summary>
+ public bool Op60_Place_Flag { get; set; }
+
+ #endregion
+
public bool IsConnect { get; set; }
/// <summary>
/// PLC浼犲�兼槸string鍨嬬殑
/// </summary>
- public string QualityStateStr{get;set;}
+ public string QualityStateStr { get; set; }
public string QualityType { get; set; }
public string QualityStateUpdateMode { get; set; }
public string QualityStateUpdateUser { get; set; }
- public Dictionary<string,string> GetWorkPieceInfoDict()
+ public Dictionary<string, string> GetWorkPieceInfoDict()
{
Dictionary<string, string> dict = new Dictionary<string, string>();
dict.Add("WorkPieceID", "WorkPieceID");
@@ -184,92 +198,236 @@
}
/// <summary>
- /// OP10/OP40 鎺ㄥ嚭鍘熷洜锛�1锛歯ok锛�2鍜�3锛歴pc锛�4锛氱姸鎬佷笉鏄庯級
+ /// OP10/OP40 鎺ㄥ嚭鍘熷洜
+ /// 1锛歯ok锛�2鍜�3锛歴pc锛�4锛氱姸鎬佷笉鏄� 5:浜岀淮鐮佽瘑鍒け璐�
/// </summary>
public string OP10Flag { get; set; }
public DateTime AlertTime { get; set; }
-
+
public string QualityOP10To1 { get; set; }
public string QualityOP40To1 { get; set; }
public string QualityOP20To1 { get; set; }
-
+ /// <summary>
+ /// 娑ㄦ柇鍔涚煩
+ /// </summary>
public string QualityOP30To1 { get; set; }
-
+ /// <summary>
+ /// 棰勬嫥绱у姏鐭�(CH1)
+ /// </summary>
public string QualityOP30To2 { get; set; }
-
+ /// <summary>
+ /// 鏈�缁堝姏鐭�(CH3)
+ /// </summary>
public string QualityOP30To3 { get; set; }
-
+ /// <summary>
+ /// 缁堟嫥绱у姏鐭�(CH3)
+ /// </summary>
public string QualityOP30To4 { get; set; }
-
+ /// <summary>
+ /// 缁堟嫥绱ц搴�(CH3)
+ /// </summary>
public string QualityOP30To5 { get; set; }
-
+ /// <summary>
+ /// 琛鍘嬭鍔涚煩
+ /// </summary>
public string QualityOP30To6 { get; set; }
public string QualityOP30To7 { get; set; }
+ /// <summary>
+ /// 棰勬嫥绱у姏鐭�(CH2)
+ /// </summary>
public string QualityOP30To8 { get; set; }
+
+ /// <summary>
+ /// 鏈�缁堝姏鐭�(CH4)
+ /// </summary>
public string QualityOP30To9 { get; set; }
+ /// <summary>
+ /// 缁堟嫥绱у姏鐭�(CH4)
+ /// </summary>
public string QualityOP30To10 { get; set; }
+ /// <summary>
+ /// 缁堟嫥绱ц搴�(CH4)
+ /// </summary>
public string QualityOP30To11 { get; set; }
-
+ /// <summary>
+ /// 鍘嬭鍔涚煩
+ /// </summary>
public string QualityOP35To1 { get; set; }
-
+ /// <summary>
+ /// Y杞翠綅绉�
+ /// </summary>
public string QualityOP35To2 { get; set; }
-
+ /// <summary>
+ /// 澶уご瀛旂洿寰�
+ /// </summary>
public string QualityOP60To1 { get; set; }
-
+ /// <summary>
+ /// 灏忓ご瀛旂洿寰�
+ /// </summary>
public string QualityOP60To2 { get; set; }
-
+ /// <summary>
+ /// 娓呮礂娓╁害
+ /// </summary>
public string QualityOP70To1 { get; set; }
-
+ /// <summary>
+ /// 娓呮礂鍘嬪姏
+ /// </summary>
+
public string QualityOP70To2 { get; set; }
-
+ /// <summary>
+ /// 鍑哄彛澶勫伐浠舵俯搴�
+ /// </summary>
public string QualityOP70To3 { get; set; }
-
+ /// <summary>
+ /// 澶уご閲嶉噺
+ /// </summary>
public string QualityOP80To1 { get; set; }
-
+ /// <summary>
+ /// 灏忓ご閲嶉噺
+ /// </summary>
public string QualityOP80To2 { get; set; }
-
+ /// <summary>
+ /// 鎬婚噸
+ /// </summary>
public string QualityOP80To3 { get; set; }
-
+ /// <summary>
+ /// 寮洸
+ /// </summary>
public string QualityOP80To4 { get; set; }
-
+ /// <summary>
+ /// 鎵害
+ /// </summary>
public string QualityOP80To5 { get; set; }
-
+ /// <summary>
+ /// 澶уご鍨傜洿搴�
+ /// </summary>
public string QualityOP80To6 { get; set; }
-
+
public string QualityOP80To7 { get; set; }
-
+
public string QualityOP80To8 { get; set; }
public string QualityOP80To9 { get; set; }
+ /// <summary>
+ /// 灏忓ご鍨傜洿搴�
+ /// </summary>
public string QualityOP80To10 { 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
public string EquipmentCurrentState { get; set; }
}
@@ -300,7 +458,7 @@
public string 杩囩▼鍙傛暟鍊� { get; set; }
public string 搴忓垪鍙� { get; set; }
public string 闆朵欢璇嗗埆鍙� { get; set; }
- public List<OP80ItemInfo> OP80ItemInfolist=new List<OP80ItemInfo>();
+ public List<OP80ItemInfo> OP80ItemInfolist = new List<OP80ItemInfo>();
public List<OP80ItemInfo> OP80ItemStatusInfolist = new List<OP80ItemInfo>();
}
--
Gitblit v1.9.3