diff --git a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db index 9887d0f..b5a0ab8 100644 Binary files a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db and b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db differ diff --git a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-shm b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-shm index f97e958..937a7bf 100644 Binary files a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-shm and b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-shm differ diff --git a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-wal b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-wal index 39613ee..084d53b 100644 Binary files a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-wal and b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/CodeChunks.db-wal differ diff --git a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db index 8eff793..887b25f 100644 Binary files a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db and b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db differ diff --git a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-shm b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-shm index 2d79d4e..143bca7 100644 Binary files a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-shm and b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-shm differ diff --git a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-wal b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-wal index cf00e75..04c0935 100644 Binary files a/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-wal and b/.vs/LargeSquareOne/CopilotIndices/17.14.1431.25910/SemanticSymbols.db-wal differ diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index 25dabee..64156e5 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -2005,7 +2005,7 @@ namespace JinYuan.ControlCenters } else { - listGradeResult[i] = (short)(99);// 走分档NG + listGradeResult[i] = (short)(97);// 走分档NG list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OKMES反馈档位:{mesResType[0]},MES未反馈正确档位"; throw new Exception("MES未反馈正确档位"); } @@ -2015,7 +2015,7 @@ namespace JinYuan.ControlCenters catch (Exception ex) { //listGradeResult[i] = (short)(CommonMethods.MESGradingSet[5] + 20); //(short)26; - listGradeResult[i] = (short)(99);// 走分档NG + listGradeResult[i] = (short)(97);// 走分档NG list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OK分档NG，MES未反馈正确档位"; LoggerHelp.WriteLog("解析出站MES分档数据异常：{ex.Message}", "SysErrorLog"); @@ -2024,7 +2024,7 @@ namespace JinYuan.ControlCenters else { list[i].Remark = $"出站条码[{list[i].BarCode}]外观检OK分档，MES断连"; - listGradeResult[i] = 99; //(short)26; + listGradeResult[i] = 97; //(short)26; // list[i].Result = "MES NG"; CommonMethods.PlcLink.WriteValue("D80", 1, Data_Type.Short); //反馈MES结果 diff --git a/JinYuan.VirtualDataLibrary/CommonMethods.cs b/JinYuan.VirtualDataLibrary/CommonMethods.cs index f10c774..a3890e0 100644 --- a/JinYuan.VirtualDataLibrary/CommonMethods.cs +++ b/JinYuan.VirtualDataLibrary/CommonMethods.cs @@ -310,235 +310,84 @@ namespace JinYuan.VirtualDataLibrary if (plcDevice != null && plcDevice.IsConnected) { DateTime Date = DateTime.Now; + #region 档位写入 - MESGradingSet = new short[] { 0, 0, 0, 0, 0, 0 }; - //1 - MESGradingSet[0] = (short)21; // 21 22 23 24 25 26 - //2 - if (mesConfig.Grading2.Trim().Equals(mesConfig.Grading1.Trim())) - MESGradingSet[1] = MESGradingSet[0]; - else - MESGradingSet[1] = (short)(MESGradingSet[0] + 1); - //3 - if (mesConfig.Grading3.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim())) - MESGradingSet[2] = MESGradingSet[0]; - else + MESGradingSet = new short[6]; + var gradingMap = new Dictionary(); + var gGradingMap = new Dictionary(); + short normalStart = 21; + short gStart = 31; + string[] specialGrading = new string[] { "NG", "扫码NG" }; + + var gradings = new[] { + mesConfig.Grading1.Trim(), + mesConfig.Grading2.Trim(), + mesConfig.Grading3.Trim(), + mesConfig.Grading4.Trim(), + mesConfig.Grading5.Trim(), + mesConfig.Grading6.Trim() + }; + + for (int i = 0; i < gradings.Length; i++) { - if (CommonMethods.mesConfig.Grading3.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim())) - MESGradingSet[2] = MESGradingSet[1]; - else + string grading = gradings[i]; + if (!specialGrading.Contains(grading) && grading.EndsWith("G")) { - var maxGrade = MESGradingSet.Max(); - MESGradingSet[2] = (short)(maxGrade + 1); - } - } - //4 - if (CommonMethods.mesConfig.Grading4.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim())) - MESGradingSet[3] = MESGradingSet[0]; - else - { - if (CommonMethods.mesConfig.Grading4.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim())) - MESGradingSet[3] = MESGradingSet[1]; - else - { - if (CommonMethods.mesConfig.Grading4.Trim().Equals(CommonMethods.mesConfig.Grading3.Trim())) - MESGradingSet[3] = MESGradingSet[2]; + if (gGradingMap.TryGetValue(grading, out short value)) + MESGradingSet[i] = value; else { - var maxGrade = MESGradingSet.Max(); - MESGradingSet[3] = (short)(maxGrade + 1); + MESGradingSet[i] = gStart; + gGradingMap.Add(grading, gStart); + gStart++; + } + } + else + { + if (gradingMap.TryGetValue(grading, out short value)) + MESGradingSet[i] = value; + else + { + MESGradingSet[i] = normalStart; + gradingMap.Add(grading, normalStart); + normalStart++; } } } - //5 - if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim())) - MESGradingSet[4] = MESGradingSet[0]; - else + #region 更新默认档位 + for (int i = 0; i < gradings.Length; i++) { - if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim())) - MESGradingSet[4] = MESGradingSet[1]; - else + switch (gradings[i]) { - if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading3.Trim())) - MESGradingSet[4] = MESGradingSet[2]; - else - { - if (CommonMethods.mesConfig.Grading5.Trim().Equals(CommonMethods.mesConfig.Grading4.Trim())) - MESGradingSet[4] = MESGradingSet[3]; - else - { - var maxGrade = MESGradingSet.Max(); - MESGradingSet[4] = (short)(maxGrade + 1); - } - } + /* 性能NG */ + case "NG": + MESGradingSet[i] = 98; + break; + /* 外观检NG + case "E63yG": + MESGradingSet[i] = 31; + break; + case "F63yG": + MESGradingSet[i] = 32; + break; + */ + /* 其它NG */ + case "拦截": + case "扫码NG": + case "其它": + MESGradingSet[i] = 97; + break; + /* 性能NG */ + case "不设置": + MESGradingSet[i] = 0; + break; } } - //6 - if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading1.Trim())) - MESGradingSet[5] = MESGradingSet[0]; - else - { - if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading2.Trim())) - MESGradingSet[5] = MESGradingSet[1]; - else - { - if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading3.Trim())) - MESGradingSet[5] = MESGradingSet[2]; - else - { - if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading4.Trim())) - MESGradingSet[5] = MESGradingSet[3]; - else - { - if (CommonMethods.mesConfig.Grading6.Trim().Equals(CommonMethods.mesConfig.Grading5.Trim())) - MESGradingSet[5] = MESGradingSet[4]; - else - { - var maxGrade = MESGradingSet.Max(); - MESGradingSet[5] = (short)(maxGrade + 1); - } - } - } - } - } - //其他if - #region 性能NG - if (CommonMethods.mesConfig.Grading6=="NG") - { - MESGradingSet[5] = 98; - } - if (CommonMethods.mesConfig.Grading5 == "NG") - { - MESGradingSet[4] = 98; - } - if (CommonMethods.mesConfig.Grading4 == "NG") - { - MESGradingSet[3] = 98; - } - if (CommonMethods.mesConfig.Grading3 == "NG") - { - MESGradingSet[2] = 98; - } - if (CommonMethods.mesConfig.Grading2 == "NG") - { - MESGradingSet[1] = 98; - } - if (CommonMethods.mesConfig.Grading1 == "NG") - { - MESGradingSet[0] = 98; - } - #endregion - - #region 外观检NG - if (CommonMethods.mesConfig.Grading6 == "E63yG") - { - MESGradingSet[5] = 31; - } - if (CommonMethods.mesConfig.Grading5 == "E63yG") - { - MESGradingSet[4] = 31; - } - if (CommonMethods.mesConfig.Grading4 == "E63yG") - { - MESGradingSet[3] = 31; - } - if (CommonMethods.mesConfig.Grading3 == "E63yG") - { - MESGradingSet[2] = 31; - } - if (CommonMethods.mesConfig.Grading2 == "E63yG") - { - MESGradingSet[1] = 31; - } - if (CommonMethods.mesConfig.Grading1 == "E63yG") - { - MESGradingSet[0] = 31; - } - - if (CommonMethods.mesConfig.Grading6 == "F63yG") - { - MESGradingSet[5] = 32; - } - if (CommonMethods.mesConfig.Grading5 == "F63yG") - { - MESGradingSet[4] = 32; - } - if (CommonMethods.mesConfig.Grading4 == "F63yG") - { - MESGradingSet[3] = 32; - } - if (CommonMethods.mesConfig.Grading3 == "F63yG") - { - MESGradingSet[2] = 32; - } - if (CommonMethods.mesConfig.Grading2 == "F63yG") - { - MESGradingSet[1] = 32; - } - if (CommonMethods.mesConfig.Grading1 == "F63yG") - { - MESGradingSet[0] = 32; - } - #endregion - - - - #region 其它NG - if (CommonMethods.mesConfig.Grading6 == "拦截" || CommonMethods.mesConfig.Grading6 == "扫码NG" || CommonMethods.mesConfig.Grading6 == "其它") - { - MESGradingSet[5] = 97; - } - if (CommonMethods.mesConfig.Grading5 == "拦截" || CommonMethods.mesConfig.Grading6 == "扫码NG" || CommonMethods.mesConfig.Grading6 == "其它") - { - MESGradingSet[4] = 97; - } - if (CommonMethods.mesConfig.Grading4 == "拦截" || CommonMethods.mesConfig.Grading6 == "扫码NG" || CommonMethods.mesConfig.Grading6 == "其它") - { - MESGradingSet[3] = 97; - } - if (CommonMethods.mesConfig.Grading3 == "拦截" || CommonMethods.mesConfig.Grading6 == "扫码NG" || CommonMethods.mesConfig.Grading6 == "其它") - { - MESGradingSet[2] = 97; - } - if (CommonMethods.mesConfig.Grading2 == "拦截" || CommonMethods.mesConfig.Grading6 == "扫码NG" || CommonMethods.mesConfig.Grading6 == "其它") - { - MESGradingSet[1] = 97; - } - if (CommonMethods.mesConfig.Grading1 == "拦截" || CommonMethods.mesConfig.Grading6 == "扫码NG" || CommonMethods.mesConfig.Grading6 == "其它") - { - MESGradingSet[0] = 97; - } - #endregion - - #region 性能NG - if (CommonMethods.mesConfig.Grading6 == "不设置") - { - MESGradingSet[5] = 0; - } - if (CommonMethods.mesConfig.Grading5 == "不设置") - { - MESGradingSet[4] = 0; - } - if (CommonMethods.mesConfig.Grading4 == "不设置") - { - MESGradingSet[3] = 0; - } - if (CommonMethods.mesConfig.Grading3 == "不设置") - { - MESGradingSet[2] = 0; - } - if (CommonMethods.mesConfig.Grading2 == "不设置") - { - MESGradingSet[1] = 0; - } - if (CommonMethods.mesConfig.Grading1 == "不设置") - { - MESGradingSet[0] = 0; - } #endregion #endregion + var isWrite1 = PlcLink.WriteValue("D2600", MESGradingSet[0], Data_Type.Short); var isWrite2 = PlcLink.WriteValue("D2601", MESGradingSet[1], Data_Type.Short); var isWrite3 = PlcLink.WriteValue("D2602", MESGradingSet[2], Data_Type.Short); diff --git a/JinYuan.VirtualDataLibrary/MesConfig.cs b/JinYuan.VirtualDataLibrary/MesConfig.cs index 4c1e3a6..5286fb4 100644 --- a/JinYuan.VirtualDataLibrary/MesConfig.cs +++ b/JinYuan.VirtualDataLibrary/MesConfig.cs @@ -125,19 +125,19 @@ namespace JinYuan.VirtualDataLibrary /// /// OK3分档 /// - public string Grading3 = "E63yG"; + public string Grading3 = "NG"; /// /// OK4分档 /// - public string Grading4 = "F63yG"; + public string Grading4 = "E63yG"; /// /// OK5分档 /// - public string Grading5 = "拦截"; + public string Grading5 = "F63yG"; /// /// OK6分档 /// - public string Grading6 = "NG"; + public string Grading6 = "拦截"; /// /// 设备状态 diff --git a/LargeSquareOne/Config/Configure.ini b/LargeSquareOne/Config/Configure.ini index 21cd64a..f472674 100644 --- a/LargeSquareOne/Config/Configure.ini +++ b/LargeSquareOne/Config/Configure.ini @@ -25,10 +25,10 @@ MES 洢IPַ=192.168.2.108 Grading1=E63y Grading2=F63y -Grading3=E63yG -Grading4=F63yG -Grading5= -Grading6=NG +Grading3=NG +Grading4=E63yG +Grading5=F63yG +Grading6= ԱȨУ=http://10.22.160.1/core/api/public/equipment/base/user/login/verify 豸趨ֵ=http://10.22.160.2/core/api/public/param/setting/request 豸趨ֵ=http://10.22.160.2/core/api/public/param/setting/change diff --git a/LargeSquareOne/LargeSquareOne.csproj.user b/LargeSquareOne/LargeSquareOne.csproj.user index 78c201e..ea14450 100644 --- a/LargeSquareOne/LargeSquareOne.csproj.user +++ b/LargeSquareOne/LargeSquareOne.csproj.user @@ -1,7 +1,7 @@ - ShowAllFiles + ProjectFiles publish\ diff --git a/LargeSquareOne/bin/Debug/Config/Configure.ini b/LargeSquareOne/bin/Debug/Config/Configure.ini index d6a701c..610539e 100644 --- a/LargeSquareOne/bin/Debug/Config/Configure.ini +++ b/LargeSquareOne/bin/Debug/Config/Configure.ini @@ -25,10 +25,10 @@ MES 洢IPַ=192.168.2.108 Grading1=E63y Grading2=F63y -Grading3=E63yG -Grading4=F63yG -Grading5= -Grading6=NG +Grading3=NG +Grading4=E63yG +Grading5=F63yG +Grading6= ԱȨУ=http://10.22.160.1/core/api/public/equipment/base/user/login/verify 豸趨ֵ=http://10.22.160.2/core/api/public/param/setting/request 豸趨ֵ=http://10.22.160.2/core/api/public/param/setting/change @@ -43,9 +43,9 @@ Grading6=NG =https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data ֵ=http://10.22.160.2/core/api/public/eve/pm/eqm/auto/grading ȫ豸״̬=http://10.22.161.62:804/device-status -guid=cdc9d92f-42b5-441e-8eb2-8b40905d98e6 -DeviceState=3 -run_AlarmMark=1 +guid=0353591d-f3d0-4bdb-a1a2-8203d4690bbf +DeviceState=1 +run_AlarmMark=0 run_IdleMark=0 [ͳƼ] diff --git a/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx index 4c6ed31..5227444 100644 Binary files a/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx and b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx differ diff --git a/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx.bak b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx.bak index 3b91c07..4c6ed31 100644 Binary files a/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx.bak and b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx.bak differ