From 81a5ef9f635ea6ca6855560ca816dacf09911fa4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 26 8月 2024 10:16:47 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs | 147 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 135 insertions(+), 12 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 9058223..c3b7044 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; }
@@ -230,43 +235,70 @@
public string QualityOP30To10 { get; set; }
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; }
@@ -277,9 +309,100 @@
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; }
}
//[NotMapped]
--
Gitblit v1.9.3