From 8d627b20332872002193cd206d06ea321f8e330c Mon Sep 17 00:00:00 2001 From: wangsr Date: Sat, 23 Dec 2023 11:25:54 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=A6=84=E8=8F=8A=E8=BE=93?= =?UTF-8?q?=E9=80=81=E9=9D=A2=E6=9D=BF=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=88=B0=E5=8F=AF=E7=94=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Util/ControlsImprot.cs | 2 - DataBlockHelper/DBHelpers/DB191Helper.cs | 2 +- .../nodeForm/DeliverControlBoard.xml | 430 +++++++++--------- 3 files changed, 216 insertions(+), 218 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs index 2fc7253..886d13a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs @@ -76,7 +76,6 @@ namespace Mesnac.Action.ChemicalWeighing.Util /// public static void SetSwitchLight(SwitchLight obj, bool set, bool alarm) { - obj.BackColor = Color.Gray; if (set == true && alarm == false) { obj.Status = SwitchLight.Statuses.ylMove; @@ -92,7 +91,6 @@ namespace Mesnac.Action.ChemicalWeighing.Util } public static void SetSwitchLight(SwitchLight obj, bool set) { - obj.BackColor = Color.Gray; if (set == true) { obj.Status = SwitchLight.Statuses.ylMove; diff --git a/DataBlockHelper/DBHelpers/DB191Helper.cs b/DataBlockHelper/DBHelpers/DB191Helper.cs index c1ef72c..57bff12 100644 --- a/DataBlockHelper/DBHelpers/DB191Helper.cs +++ b/DataBlockHelper/DBHelpers/DB191Helper.cs @@ -11,7 +11,7 @@ namespace DataBlockHelper.DBHelpers { public DB191Helper() { - bytes = PlcConnect.Instance.Read("DB191.0.0", 30).Content; + bytes = PlcConnect.Instance.Read("DB191.0.0", 32).Content; } public ControlPanelEntity ControlPanel_A => new ControlPanelEntity(0, bytes); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/DeliverControlBoard.xml b/Main/MCEdit/Data/MCProject/nodeForm/DeliverControlBoard.xml index 14dbc45..42bb873 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/DeliverControlBoard.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/DeliverControlBoard.xml @@ -3,39 +3,39 @@ - 351, 587 + 329, 520 StopLightC - 53, 53 + 36, 36 - 81, 587 + 90, 520 StartLightC - 53, 53 + 36, 36 - 369, 720 + 396, 575 AlarmLightC - 53, 53 + 36, 36 - 218, 702 + 187, 589 ActionBottleFullC - 53, 53 + 36, 36 - 110, 702 + 100, 589 TubeCleanC - 53, 53 + 36, 36 - 13, 702 + 23, 589 RoadCorrectC - 53, 53 + 36, 36 @@ -58,7 +58,7 @@ MiddleRight 下发 宋体, 12pt - 141, 462 + 128, 395 DownLoadBoardC 206, 57 110 @@ -79,7 +79,7 @@ True 目标罐满仓 宋体, 12pt - 201, 679 + 162, 566 MCLabel85 88, 16 @@ -129,7 +129,7 @@ DarkGray 停止 宋体, 12pt - 276, 525 + 246, 458 BoardStopC 206, 57 105 @@ -155,7 +155,7 @@ MiddleRight 启动 宋体, 12pt - 6, 525 + 6, 458 BoardStartC 206, 57 104 @@ -176,34 +176,34 @@ True 管道清扫 宋体, 12pt - 103, 679 + 84, 566 MCLabel84 72, 16 - 297, 26 + 212, 23 SLDC - 53, 53 + 36, 36 - 204, 25 + 150, 23 SLCC - 53, 53 + 36, 36 - 110, 26 + 86, 23 SLBC - 53, 53 + 36, 36 - 19, 26 + 24, 23 SLAC - 53, 53 + 36, 36 @@ -221,9 +221,9 @@ True True 大仓B - 107, 84 + 79, 64 StoreBC - 87, 24 + 58, 24 102 @@ -242,9 +242,9 @@ True True 大仓C - 200, 84 + 143, 64 StoreCC - 87, 24 + 58, 24 101 @@ -263,9 +263,9 @@ True True 大仓D - 293, 84 + 207, 64 StoreDC - 87, 24 + 58, 24 100 @@ -284,7 +284,7 @@ True True - 386, 52 + 271, 64 StoreNoneC 46, 24 98 @@ -305,49 +305,49 @@ True True 大仓A - 14, 84 + 15, 64 StoreAC - 87, 24 + 58, 24 97 False 大仓 - 宋体, 12pt - 6, 334 + 宋体, 9pt + 6, 290 GroupBox2 - 475, 122 + 445, 99 103 - 401, 21 + 326, 22 SGLEC - 53, 53 + 36, 36 - 308, 22 + 252, 22 SGLDC - 53, 53 + 36, 36 - 215, 21 + 179, 21 SGLCC - 53, 53 + 36, 36 - 121, 22 + 106, 22 SGLBC - 53, 53 + 36, 36 - 29, 22 + 38, 22 SGLAC - 53, 53 + 36, 36 @@ -365,9 +365,9 @@ True True 大仓组B - 107, 81 + 96, 65 StoreGroupBC - 87, 24 + 67, 24 102 @@ -386,9 +386,9 @@ True True 大仓组C - 200, 81 + 169, 65 StoreGroupCC - 87, 24 + 67, 24 101 @@ -407,9 +407,9 @@ True True 大仓组D - 293, 81 + 242, 65 StoreGroupDC - 87, 24 + 67, 24 100 @@ -428,9 +428,9 @@ True True 大仓组E - 386, 81 + 315, 65 StoreGroupEC - 87, 24 + 67, 24 99 @@ -449,7 +449,7 @@ True True - 386, 113 + 388, 65 StoreGroupNoneC 46, 24 98 @@ -470,17 +470,17 @@ True True 大仓组A - 14, 81 + 23, 65 StoreGroupAC - 87, 24 + 67, 24 97 False 大仓组 - 宋体, 12pt + 宋体, 9pt 6, 185 GroupBox1 - 476, 143 + 446, 99 103 @@ -500,7 +500,7 @@ True True 单罐2 - 15, 59 + 14, 50 SingleBottle2C 87, 24 102 @@ -521,7 +521,7 @@ True True 双罐 - 155, 40 + 129, 34 DoubleBottleC 110, 24 101 @@ -542,17 +542,17 @@ True True 单罐1 - 15, 29 + 15, 20 SingleBottle1C 108, 24 97 False 压送罐 - 宋体, 12pt + 宋体, 9pt 6, 83 GroupBox12 - 476, 96 + 446, 96 98 @@ -575,9 +575,9 @@ DarkGray 清报警 宋体, 12pt - 311, 658 + 256, 566 AlarmClearC - 171, 57 + 118, 57 120 @@ -596,54 +596,54 @@ True 路径正确 宋体, 12pt - 6, 679 + 6, 566 MCLabel83 72, 16 False 输送操作面板 - 宋体, 12pt - 1104, 12 + 宋体, 9pt + 937, 12 GroupBox3 - 488, 787 + 457, 642 113 - 350, 587 + 328, 520 StopLightB - 53, 53 + 36, 36 - 80, 587 + 90, 520 StartLightB - 53, 53 + 36, 36 - 368, 720 + 394, 575 AlarmLightB - 53, 53 + 36, 36 - 217, 702 + 188, 589 ActionBottleFullB - 53, 53 + 36, 36 - 109, 702 + 99, 589 TubeCleanB - 53, 53 + 36, 36 - 12, 702 + 23, 589 RoadCorrectB - 53, 53 + 36, 36 @@ -666,7 +666,7 @@ MiddleRight 下发 宋体, 12pt - 141, 462 + 125, 395 DownLoadBoardB 206, 57 110 @@ -687,7 +687,7 @@ True 目标罐满仓 宋体, 12pt - 201, 679 + 162, 566 MCLabel89 88, 16 @@ -712,7 +712,7 @@ MiddleRight 面板启用 宋体, 12pt - 147, 20 + 125, 20 BoardOnB 206, 57 108 @@ -737,7 +737,7 @@ DarkGray 停止 宋体, 12pt - 276, 525 + 245, 458 BoardStopB 206, 57 105 @@ -763,7 +763,7 @@ MiddleRight 启动 宋体, 12pt - 6, 525 + 6, 458 BoardStartB 206, 57 104 @@ -784,34 +784,34 @@ True 管道清扫 宋体, 12pt - 103, 679 + 84, 566 MCLabel90 72, 16 - 297, 26 + 211, 23 SLDB - 53, 53 + 36, 36 - 204, 25 + 150, 23 SLCB - 53, 53 + 36, 36 - 110, 26 + 89, 22 SLBB - 53, 53 + 36, 36 - 19, 26 + 28, 23 SLAB - 53, 53 + 36, 36 @@ -829,9 +829,9 @@ True True 大仓B - 107, 84 + 83, 64 StoreBB - 87, 24 + 54, 24 102 @@ -850,9 +850,9 @@ True True 大仓C - 200, 84 + 143, 64 StoreCB - 87, 24 + 54, 24 101 @@ -871,9 +871,9 @@ True True 大仓D - 293, 84 + 203, 64 StoreDB - 87, 24 + 54, 24 100 @@ -892,7 +892,7 @@ True True - 386, 52 + 263, 64 StoreNoneB 46, 24 98 @@ -913,25 +913,25 @@ True True 大仓A - 14, 84 + 23, 64 StoreAB - 87, 24 + 54, 24 97 False 大仓 - 宋体, 12pt - 6, 334 + 宋体, 9pt + 6, 290 GroupBox6 - 475, 122 + 445, 99 103 - 401, 22 + 330, 24 SGLEB - 53, 53 + 36, 36 @@ -949,16 +949,16 @@ True True 大仓组B - 107, 81 + 99, 65 StoreGroupBB - 87, 24 + 67, 24 102 - 308, 23 + 258, 24 SGLDB - 53, 53 + 36, 36 @@ -976,16 +976,16 @@ True True 大仓组C - 200, 81 + 172, 65 StoreGroupCB - 87, 24 + 67, 24 101 - 215, 22 + 184, 24 SGLCB - 53, 53 + 36, 36 @@ -1003,16 +1003,16 @@ True True 大仓组D - 293, 81 + 245, 65 StoreGroupDB - 87, 24 + 67, 24 100 - 121, 23 + 112, 24 SGLBB - 53, 53 + 36, 36 @@ -1030,16 +1030,16 @@ True True 大仓组E - 386, 81 + 318, 65 StoreGroupEB - 87, 24 + 67, 24 99 - 29, 23 + 38, 23 SGLAB - 53, 53 + 36, 36 @@ -1057,9 +1057,9 @@ True True - 386, 113 + 391, 65 StoreGroupNoneB - 46, 24 + 36, 24 98 @@ -1078,17 +1078,17 @@ True True 大仓组A - 14, 81 + 23, 65 StoreGroupAB - 87, 24 + 67, 24 97 False 大仓组 - 宋体, 12pt + 宋体, 9pt 6, 185 GroupBox5 - 476, 143 + 445, 99 103 @@ -1108,7 +1108,7 @@ True True 单罐2 - 15, 59 + 14, 50 SingleBottle2B 87, 24 102 @@ -1129,7 +1129,7 @@ True True 双罐 - 155, 40 + 128, 34 DoubleBottleB 110, 24 101 @@ -1150,17 +1150,17 @@ True True 单罐1 - 15, 29 + 14, 20 SingleBottle1B 108, 24 97 False 压送罐 - 宋体, 12pt + 宋体, 9pt 6, 83 GroupBox4 - 476, 96 + 445, 96 98 @@ -1183,9 +1183,9 @@ DarkGray 清报警 宋体, 12pt - 311, 658 + 256, 566 AlarmClearB - 171, 57 + 116, 57 120 @@ -1204,42 +1204,42 @@ True 路径正确 宋体, 12pt - 6, 679 + 6, 566 MCLabel91 72, 16 False 输送操作面板 - 宋体, 12pt - 557, 12 + 宋体, 9pt + 474, 12 GroupBox7 - 488, 787 + 457, 642 112 - 351, 587 + 329, 520 StopLightA - 53, 53 + 36, 36 - 81, 587 + 89, 520 StartLightA - 53, 53 + 36, 36 - 369, 712 + 394, 575 AlarmLightA - 53, 53 + 36, 36 - 218, 694 + 189, 589 ActionBottleFullA - 53, 53 + 36, 36 @@ -1257,15 +1257,15 @@ True 目标罐满仓 宋体, 12pt - 201, 671 + 162, 566 MCLabel86 88, 16 - 110, 694 + 101, 589 TubeCleanA - 53, 53 + 36, 36 @@ -1283,15 +1283,15 @@ True 管道清扫 宋体, 12pt - 103, 671 + 84, 566 MCLabel87 72, 16 - 13, 694 + 20, 589 RoadCorrectA - 53, 53 + 36, 36 @@ -1314,7 +1314,7 @@ MiddleRight 下发 宋体, 12pt - 141, 462 + 125, 395 DownLoadBoardA 206, 57 110 @@ -1340,7 +1340,7 @@ MiddleRight 面板启用 宋体, 12pt - 138, 20 + 125, 20 BoardOnA 206, 57 108 @@ -1361,7 +1361,7 @@ True 路径正确 宋体, 12pt - 6, 671 + 6, 566 MCLabel88 72, 16 @@ -1385,9 +1385,9 @@ DarkGray 清报警 宋体, 12pt - 311, 650 + 254, 566 AlarmClearA - 171, 57 + 120, 57 106 @@ -1410,7 +1410,7 @@ DarkGray 停止 宋体, 12pt - 276, 525 + 245, 458 BoardStopA 206, 57 105 @@ -1436,7 +1436,7 @@ MiddleRight 启动 宋体, 12pt - 6, 525 + 6, 458 BoardStartA 206, 57 104 @@ -1444,9 +1444,9 @@ - 297, 23 + 213, 23 SLDA - 53, 53 + 36, 36 @@ -1464,16 +1464,16 @@ True True 大仓B - 107, 84 + 78, 64 StoreBA - 87, 24 + 59, 24 102 - 204, 22 + 148, 22 SLCA - 53, 53 + 36, 36 @@ -1491,16 +1491,16 @@ True True 大仓C - 200, 84 + 143, 64 StoreCA - 87, 24 + 59, 24 101 - 110, 23 + 82, 23 SLBA - 53, 53 + 36, 36 @@ -1518,16 +1518,16 @@ True True 大仓D - 293, 84 + 208, 64 StoreDA - 87, 24 + 59, 24 100 19, 23 SLAA - 53, 53 + 36, 36 @@ -1545,7 +1545,7 @@ True True - 386, 52 + 273, 64 StoreNoneA 46, 24 98 @@ -1566,49 +1566,49 @@ True True 大仓A - 14, 84 + 13, 64 StoreAA - 87, 24 + 59, 24 97 False 大仓 - 宋体, 12pt - 6, 334 + 宋体, 9pt + 6, 290 GroupBox10 - 475, 122 + 445, 99 103 - 398, 23 + 338, 23 SGLEA - 53, 53 + 36, 36 - 305, 24 + 260, 24 SGLDA - 53, 53 + 36, 36 - 212, 23 + 182, 23 SGLCA - 53, 53 + 36, 36 - 118, 24 + 103, 24 SGLBA - 53, 53 + 36, 36 26, 24 SGLAA - 53, 53 + 36, 36 @@ -1626,9 +1626,9 @@ True True 大仓组B - 107, 81 + 92, 65 StoreGroupBA - 87, 24 + 70, 24 102 @@ -1647,9 +1647,9 @@ True True 大仓组C - 200, 81 + 170, 65 StoreGroupCA - 87, 24 + 70, 24 101 @@ -1668,9 +1668,9 @@ True True 大仓组D - 293, 81 + 248, 65 StoreGroupDA - 87, 24 + 70, 24 100 @@ -1689,9 +1689,9 @@ True True 大仓组E - 386, 81 + 326, 65 StoreGroupEA - 87, 24 + 70, 24 99 @@ -1710,9 +1710,9 @@ True True - 386, 113 + 404, 65 StoreGroupNoneA - 46, 24 + 35, 24 98 @@ -1731,17 +1731,17 @@ True True 大仓组A - 14, 81 + 14, 65 StoreGroupAA - 87, 24 + 70, 24 97 False 大仓组 - 宋体, 12pt + 宋体, 9pt 6, 185 GroupBox9 - 476, 143 + 445, 99 103 @@ -1761,7 +1761,7 @@ True True 单罐2 - 15, 59 + 14, 50 SingleBottle2A 87, 24 102 @@ -1782,7 +1782,7 @@ True True 双罐 - 155, 40 + 128, 34 DoubleBottleA 110, 24 101 @@ -1803,25 +1803,25 @@ True True 单罐1 - 15, 29 + 14, 20 SingleBottle1A 108, 24 97 False 压送罐 - 宋体, 12pt + 宋体, 9pt 6, 83 GroupBox8 - 476, 96 + 445, 96 98 False 输送操作面板A - 宋体, 12pt + 宋体, 9pt 12, 12 GroupBox11 - 488, 787 + 456, 642 111 @@ -1840,7 +1840,7 @@ False False Control - 1622, 848 + 1422, 702 WindowsDefaultLocation 输送操作面板 Normal