From d5f80f2bae790fd13c159ff59568766b22495e30 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 09 6月 2024 14:09:10 +0800
Subject: [PATCH] 修复bug

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs |   57 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 24 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..9058223 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/MiddleModel/WorkPieceLogMiddle.cs
@@ -166,17 +166,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");
@@ -189,29 +198,29 @@
         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; }
 
-        
+
         public string QualityOP30To1 { get; set; }
 
-        
+
         public string QualityOP30To2 { get; set; }
 
-        
+
         public string QualityOP30To3 { get; set; }
 
-        
+
         public string QualityOP30To4 { get; set; }
 
-        
+
         public string QualityOP30To5 { get; set; }
 
-        
+
         public string QualityOP30To6 { get; set; }
 
 
@@ -224,46 +233,46 @@
 
         public string QualityOP35To1 { get; set; }
 
-        
+
         public string QualityOP35To2 { get; set; }
 
-        
+
         public string QualityOP60To1 { get; set; }
 
-        
+
         public string QualityOP60To2 { get; set; }
 
-        
+
         public string QualityOP70To1 { get; set; }
 
-        
+
         public string QualityOP70To2 { get; set; }
 
-        
+
         public string QualityOP70To3 { get; set; }
 
-        
+
         public string QualityOP80To1 { get; set; }
 
-        
+
         public string QualityOP80To2 { get; set; }
 
-        
+
         public string QualityOP80To3 { get; set; }
 
-        
+
         public string QualityOP80To4 { get; set; }
 
-        
+
         public string QualityOP80To5 { get; set; }
 
-        
+
         public string QualityOP80To6 { get; set; }
 
-        
+
         public string QualityOP80To7 { get; set; }
 
-        
+
         public string QualityOP80To8 { get; set; }
 
 
@@ -300,7 +309,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