diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 6de54d9..f0749ae 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -102,6 +102,22 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl SwitchLight WScale_2_LowLevel; SwitchLight WScale_3_LowLevel; SwitchLight WScale_4_LowLevel; + SwitchLight DMWETER1; + SwitchLight DMWETER11; + SwitchLight DMWETER2; + SwitchLight DMWETER22; + SwitchLight DMWETER3; + SwitchLight DMWETER33; + SwitchLight DMWETER4; + SwitchLight DMWETER44; + SwitchLight DMWETER5; + SwitchLight DMWETER55; + SwitchLight DMWETER6; + SwitchLight DMWETER66; + SwitchLight DMWETER7; + SwitchLight DMWETER77; + SwitchLight DMWETER8; + SwitchLight DMWETER88; MCLabel topPressure_V1; MCLabel topPressure_V2; @@ -437,6 +453,22 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl bool WScale_2_LowLevel_Set; bool WScale_3_LowLevel_Set; bool WScale_4_LowLevel_Set; + bool DMWETER1_Set; + bool DMWETER2_Set; + bool DMWETER3_Set; + bool DMWETER4_Set; + bool DMWETER5_Set; + bool DMWETER6_Set; + bool DMWETER7_Set; + bool DMWETER8_Set; + bool DMWETER1_Alarm; + bool DMWETER2_Alarm; + bool DMWETER3_Alarm; + bool DMWETER4_Alarm; + bool DMWETER5_Alarm; + bool DMWETER6_Alarm; + bool DMWETER7_Alarm; + bool DMWETER8_Alarm; float topPressure_V1_Set; float topPressure_V2_Set; @@ -485,6 +517,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl float DM2CSF01_Set; float DM2DSF01_Set; + bool DM1ASF01_Set; bool DM1BSF01_Set; bool DM1CSF01_Set; @@ -1603,6 +1636,23 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl DM1DRY3_Running_Set = DB2103.DM1DRY3.Running; DM1DRY4_Running_Set = DB2103.DM1DRY4.Running; + DMWETER1_Set = DB2103.DMWETER1.Running; + DMWETER2_Set = DB2103.DMWETER2.Running; + DMWETER3_Set = DB2103.DMWETER3.Running; + DMWETER4_Set = DB2103.DMWETER4.Running; + DMWETER5_Set = DB2103.DMWETER5.Running; + DMWETER6_Set = DB2103.DMWETER6.Running; + DMWETER7_Set = DB2103.DMWETER7.Running; + DMWETER8_Set = DB2103.DMWETER8.Running; + + DMWETER1_Alarm = DB2103.DMWETER1.Alarm; + DMWETER2_Alarm = DB2103.DMWETER2.Alarm; + DMWETER3_Alarm = DB2103.DMWETER3.Alarm; + DMWETER4_Alarm = DB2103.DMWETER4.Alarm; + DMWETER5_Alarm = DB2103.DMWETER5.Alarm; + DMWETER6_Alarm = DB2103.DMWETER6.Alarm; + DMWETER7_Alarm = DB2103.DMWETER7.Alarm; + DMWETER8_Alarm = DB2103.DMWETER8.Alarm; SetMCLabel(DM1DRY1_ACT_Speed, (float)Math.Round(DM1DRY1_ACT_Speed_Set, 2)); SetMCLabel(DM1DRY2_ACT_Speed, (float)Math.Round(DM1DRY2_ACT_Speed_Set, 2)); @@ -1678,6 +1728,23 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl SetFan(DM1DRY3_Running, DM1DRY3_Running_Set); SetFan(DM1DRY4_Running, DM1DRY4_Running_Set); SetFan(PM3ADF01, PM3ADF01_Set); + + SetSwitchLight(DMWETER1, DMWETER1_Set, DMWETER1_Alarm); + SetSwitchLight(DMWETER11, DMWETER1_Set, DMWETER1_Alarm); + SetSwitchLight(DMWETER2, DMWETER2_Set, DMWETER2_Alarm); + SetSwitchLight(DMWETER22, DMWETER2_Set, DMWETER2_Alarm); + SetSwitchLight(DMWETER3, DMWETER3_Set, DMWETER3_Alarm); + SetSwitchLight(DMWETER33, DMWETER3_Set, DMWETER3_Alarm); + SetSwitchLight(DMWETER4, DMWETER4_Set, DMWETER4_Alarm); + SetSwitchLight(DMWETER44, DMWETER4_Set, DMWETER4_Alarm); + SetSwitchLight(DMWETER5, DMWETER5_Set, DMWETER5_Alarm); + SetSwitchLight(DMWETER55, DMWETER5_Set, DMWETER5_Alarm); + SetSwitchLight(DMWETER6, DMWETER6_Set, DMWETER6_Alarm); + SetSwitchLight(DMWETER66, DMWETER6_Set, DMWETER6_Alarm); + SetSwitchLight(DMWETER7, DMWETER7_Set, DMWETER7_Alarm); + SetSwitchLight(DMWETER77, DMWETER7_Set, DMWETER7_Alarm); + SetSwitchLight(DMWETER8, DMWETER8_Set, DMWETER8_Alarm); + SetSwitchLight(DMWETER88, DMWETER8_Set, DMWETER8_Alarm); } /// @@ -2114,6 +2181,22 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl WScale_2_LowLevel = GetSwitchLight("WScale_2_LowLevel"); WScale_3_LowLevel = GetSwitchLight("WScale_3_LowLevel"); WScale_4_LowLevel = GetSwitchLight("WScale_4_LowLevel"); + DMWETER1 = GetSwitchLight("DMWETER1"); + DMWETER11 = GetSwitchLight("DMWETER11"); + DMWETER2 = GetSwitchLight("DMWETER2"); + DMWETER22 = GetSwitchLight("DMWETER22"); + DMWETER3 = GetSwitchLight("DMWETER3"); + DMWETER33 = GetSwitchLight("DMWETER33"); + DMWETER4 = GetSwitchLight("DMWETER4"); + DMWETER44 = GetSwitchLight("DMWETER44"); + DMWETER5 = GetSwitchLight("DMWETER5"); + DMWETER55 = GetSwitchLight("DMWETER55"); + DMWETER6 = GetSwitchLight("DMWETER6"); + DMWETER66 = GetSwitchLight("DMWETER66"); + DMWETER7 = GetSwitchLight("DMWETER7"); + DMWETER77 = GetSwitchLight("DMWETER77"); + DMWETER8 = GetSwitchLight("DMWETER8"); + DMWETER88 = GetSwitchLight("DMWETER88"); topPressure_V1 = GetMCLabel("topPressure_V1"); topPressure_V2 = GetMCLabel("topPressure_V2"); diff --git a/DataBlockHelper/PlcConnect.cs b/DataBlockHelper/PlcConnect.cs index 9e699e8..fefb566 100644 --- a/DataBlockHelper/PlcConnect.cs +++ b/DataBlockHelper/PlcConnect.cs @@ -31,8 +31,8 @@ namespace DataBlockHelper { SiemensPLCS siemensPLCS = SiemensPLCS.S1500; SiemensS7Net s7 = new SiemensS7Net(siemensPLCS); - s7.IpAddress = "192.168.0.100"; - s7.Port = 7788; + s7.IpAddress = "172.18.4.100"; + s7.Port = 102; s7.ConnectServer(); return s7; } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 2786ebd..79621a7 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,27 +1,29 @@ - + - Red - DarkGray + Control + Control False - Modify + None True True - MCLabel149 - Red - 23, 115 - MCWatchDog - 65, 12 + 8 + Transparent + 宋体, 14pt + White + 1810, 443 + MCLabel142 + 19, 19 - + Control @@ -35,13 +37,15 @@ None True True - 8 - DarkGray - 1803, 505 - MCLabel150 - 11, 12 + 7 + Transparent + 宋体, 14pt + White + 1717, 443 + MCLabel143 + 19, 19 - + Control @@ -55,13 +59,15 @@ None True True - 7 - DarkGray - 1725, 505 - MCLabel151 - 11, 12 + 6 + Transparent + 宋体, 14pt + White + 1498, 443 + MCLabel144 + 19, 19 - + Control @@ -75,13 +81,15 @@ None True True - 6 - DarkGray - 1487, 505 - MCLabel152 - 11, 12 + 5 + Transparent + 宋体, 14pt + White + 1405, 443 + MCLabel145 + 19, 19 - + Control @@ -96,12 +104,14 @@ True True 4 - DarkGray - 1248, 505 - MCLabel153 - 11, 12 + Transparent + 宋体, 14pt + White + 1253, 444 + MCLabel146 + 19, 19 - + Control @@ -116,12 +126,77 @@ True True 3 - DarkGray - 1172, 505 - MCLabel154 + Transparent + 宋体, 14pt + White + 1158, 445 + MCLabel147 + 19, 19 + + + + + Control + Control + + + False + + + + None + True + True + 2 + Transparent + 宋体, 14pt + White + 947, 444 + MCLabel148 + 19, 19 + + + + + + Red + DarkGray + + + False + + + + None + True + True + WatchDog + Red + 33, 71 + MCLabel149 + 53, 12 + + + + + Red + DarkGray + + + False + + + + Modify + True + True + 0 + Red + 53, 89 + MCWatchDog 11, 12 - + Control @@ -135,13 +210,13 @@ None True True - 5 + 8 DarkGray - 1410, 505 - MCLabel155 + 1803, 505 + MCLabel150 11, 12 - + Control @@ -155,10 +230,10 @@ None True True - 2 + 7 DarkGray - 941, 505 - MCLabel156 + 1725, 505 + MCLabel151 11, 12 @@ -176,10 +251,12 @@ True True 1 - DarkGray - 865, 505 + Transparent + 宋体, 14pt + White + 856, 445 MCLabel157 - 11, 12 + 19, 19 @@ -188,100 +265,100 @@ BU4BLT07 14, 13 - + 1792, 470 - SwitchLight65 + DMWETER8 12, 12 - + 1818, 470 - SwitchLight66 + DMWETER88 12, 12 - + 1709, 470 - SwitchLight63 + DMWETER7 12, 12 - + 1735, 470 - SwitchLight64 + DMWETER77 12, 12 - + 1479, 470 - SwitchLight61 + DMWETER6 12, 12 - + 1505, 470 - SwitchLight62 + DMWETER66 12, 12 - + 1396, 470 - SwitchLight59 + DMWETER5 12, 12 - + 1422, 470 - SwitchLight60 + DMWETER55 12, 12 - + 1238, 472 - SwitchLight57 + DMWETER4 12, 12 - + 1264, 472 - SwitchLight58 + DMWETER44 12, 12 - + 1154, 472 - SwitchLight55 + DMWETER3 12, 12 - + 1180, 472 - SwitchLight56 + DMWETER33 12, 12 - + 932, 472 - SwitchLight53 + DMWETER2 12, 12 - + 958, 472 - SwitchLight54 + DMWETER22 12, 12 - + 848, 472 - SwitchLight52 + DMWETER1 12, 12 - + 874, 472 - SwitchLight51 + DMWETER11 12, 12 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml index 95ab8fb..da0d9d3 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml @@ -19,7 +19,7 @@ Red DarkGray 加载配置 - 732, 601 + 731, 432 MCButton23 85, 47 29 @@ -43,7 +43,7 @@ Red DarkGray 保存配置 - 732, 508 + 731, 339 MCButton22 85, 47 8 @@ -67,7 +67,7 @@ True True - 6, 35 + 6, 20 MCTextBox2147483626 148, 21 1 @@ -91,7 +91,7 @@ Red DarkGray 日志查询 - 6, 88 + 6, 47 MCButton14 148, 40 0 @@ -100,7 +100,7 @@ 日志查询 696, 12 GroupBox10 - 160, 387 + 160, 94 28