From f0826424c58f3e925a77437111a2e06808bfff26 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 17:48:25 +0800
Subject: [PATCH] //处理OP30的数据

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs |  178 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index f2d3302..0316d96 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -1991,98 +1991,98 @@
 
         }
 
-        public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
-        {
-            try
-            {
-                string fileContent = File.ReadAllText(FullName);
-                string[] lines2 = fileContent.Split('\n');
-                bool IDCodeIndex = false;
-                int Mcount = 0;
-                int i = 0;
-                int count = 0;
-                foreach (string line in lines2)
-                {
-                    count++;
-                    if (count == 4)
-                    {//鑾峰彇璐ㄩ噺缁撴灉
-                        var list = line.Split(' ');
-                        if (list.Count() > 0)
-                        {
-                            var str = list[list.Count() - 1].ToString().Trim();
-                            wplog.QualityStateStr = str.Equals("OK") ? "OK" : "NG";
-                        }
-                    }
-                    // 澶勭悊姣忎竴琛岀殑閫昏緫
-                    if (line.Contains("ID-Code"))//涓や釜鎷х揣锛屾瘡涓墠闈㈤兘鏈塈D-Code
-                    {
-                        i++;
-                        IDCodeIndex = true;
-                        Mcount = 0;
-                    }
-                    if (IDCodeIndex)
-                    {
-                        if (line.Contains(" M "))//绗笁涓狹琛屾槸鎷х揣鏁版嵁
-                        {//鏈�缁堝姏鐭�
-                            Mcount++;
-                            if (Mcount == 3)
-                            {
-                                var str = line.Replace("+", "").Replace("-", "");
-                                var list = str.Split('M');
-                                if (list.Count() == 4)
-                                {
-                                    if (i == 1)
-                                    {//CH3
-                                        wplog.QualityOP30To3 = list[2].ToString().Trim();
-                                    }
-                                    else
-                                    {//CH4
-                                        wplog.QualityOP30To9 = list[2].ToString().Trim();
-                                    }
-                                }
-                                IDCodeIndex = false;
-                            }
-                        }
+        //public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
+        //{
+        //    try
+        //    {
+        //        string fileContent = File.ReadAllText(FullName);
+        //        string[] lines2 = fileContent.Split('\n');
+        //        bool IDCodeIndex = false;
+        //        int Mcount = 0;
+        //        int i = 0;
+        //        int count = 0;
+        //        foreach (string line in lines2)
+        //        {
+        //            count++;
+        //            if (count == 4)
+        //            {//鑾峰彇璐ㄩ噺缁撴灉
+        //                var list = line.Split(' ');
+        //                if (list.Count() > 0)
+        //                {
+        //                    var str = list[list.Count() - 1].ToString().Trim();
+        //                    wplog.QualityStateStr = str.Equals("OK") ? "OK" : "NG";
+        //                }
+        //            }
+        //            // 澶勭悊姣忎竴琛岀殑閫昏緫
+        //            if (line.Contains("ID-Code"))//涓や釜鎷х揣锛屾瘡涓墠闈㈤兘鏈塈D-Code
+        //            {
+        //                i++;
+        //                IDCodeIndex = true;
+        //                Mcount = 0;
+        //            }
+        //            if (IDCodeIndex)
+        //            {
+        //                if (line.Contains(" M "))//绗笁涓狹琛屾槸鎷х揣鏁版嵁
+        //                {//鏈�缁堝姏鐭�
+        //                    Mcount++;
+        //                    if (Mcount == 3)
+        //                    {
+        //                        var str = line.Replace("+", "").Replace("-", "");
+        //                        var list = str.Split('M');
+        //                        if (list.Count() == 4)
+        //                        {
+        //                            if (i == 1)
+        //                            {//CH3
+        //                                wplog.QualityOP30To3 = list[2].ToString().Trim();
+        //                            }
+        //                            else
+        //                            {//CH4
+        //                                wplog.QualityOP30To9 = list[2].ToString().Trim();
+        //                            }
+        //                        }
+        //                        IDCodeIndex = false;
+        //                    }
+        //                }
 
-                    }
-                    if (line.Contains(" MWSP "))
-                    {//缁堟嫥绱у姏鐭�  缁堟嫥绱ц搴�
-                        var list = line.Split(new String[] { " MWS " }, StringSplitOptions.None);
-                        if (list.Count() == 2)
-                        {
-                            if (i == 1)
-                            {//CH3
-                                wplog.QualityOP30To4 = list[1].ToString().Trim();
-                            }
-                            else
-                            {//CH4
-                                wplog.QualityOP30To10 = list[1].ToString().Trim();
-                            }
-                            var list2 = list[0].Split(new String[] { " W " }, StringSplitOptions.None);
-                            if (list2.Count() == 2)
-                            {
-                                var str = list2[1].ToString();
-                                if (i == 1)
-                                {//CH3
-                                    wplog.QualityOP30To5 = str.Substring(0, str.IndexOf("MWSP")).Trim();
-                                }
-                                else
-                                {//CH4
-                                    wplog.QualityOP30To11 = str.Substring(0, str.IndexOf("MWSP")).Trim();
-                                }
-                            }
-                        }
+        //            }
+        //            if (line.Contains(" MWSP "))
+        //            {//缁堟嫥绱у姏鐭�  缁堟嫥绱ц搴�
+        //                var list = line.Split(new String[] { " MWS " }, StringSplitOptions.None);
+        //                if (list.Count() == 2)
+        //                {
+        //                    if (i == 1)
+        //                    {//CH3
+        //                        wplog.QualityOP30To4 = list[1].ToString().Trim();
+        //                    }
+        //                    else
+        //                    {//CH4
+        //                        wplog.QualityOP30To10 = list[1].ToString().Trim();
+        //                    }
+        //                    var list2 = list[0].Split(new String[] { " W " }, StringSplitOptions.None);
+        //                    if (list2.Count() == 2)
+        //                    {
+        //                        var str = list2[1].ToString();
+        //                        if (i == 1)
+        //                        {//CH3
+        //                            wplog.QualityOP30To5 = str.Substring(0, str.IndexOf("MWSP")).Trim();
+        //                        }
+        //                        else
+        //                        {//CH4
+        //                            wplog.QualityOP30To11 = str.Substring(0, str.IndexOf("MWSP")).Trim();
+        //                        }
+        //                    }
+        //                }
 
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                //Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}CH5宸ヤ綅璐ㄩ噺鏁版嵁寮傚父宸ヤ欢鍙凤細{(wplog.WorkPieceID == null ? "" : wplog.WorkPieceID)} 鏂囦欢鍚嶏細{FullName}锛�", ex);
-            }
-            return wplog;
+        //            }
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        //Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}CH5宸ヤ綅璐ㄩ噺鏁版嵁寮傚父宸ヤ欢鍙凤細{(wplog.WorkPieceID == null ? "" : wplog.WorkPieceID)} 鏂囦欢鍚嶏細{FullName}锛�", ex);
+        //    }
+        //    return wplog;
 
-        }
+        //}
         private void button27_Click(object sender, EventArgs e)
         {
             try

--
Gitblit v1.9.3