diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index ecf7374..edeab51 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -45,7 +45,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver /// DataTable AllAlarmTable = new DataTable(); - private string AlarmString = "报警信息 "; + private string AlarmString = ""; #region 控件属性 @@ -118,7 +118,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver timer.Stop(); timer.Dispose(); } - + DB1 = new DB1Helper(); DB90 = new DB90Helper(); DB2103 = new DB2103Helper(); @@ -349,48 +349,48 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.AS1OSI01_Alarm = DB90.AS1OSI01.Alarm; - PlcTemp.DV1PCP01_SetL = DB90.DV1PCP01.SetLeft; - PlcTemp.DV1PCP02_SetL = DB90.DV1PCP02.SetLeft; - PlcTemp.DV1PCP03_SetL = DB90.DV1PCP03.SetLeft; - PlcTemp.DV1PCP04_SetL = DB90.DV1PCP04.SetLeft; - PlcTemp.DV1PCP05_SetL = DB90.DV1PCP05.SetLeft; - PlcTemp.DV1PCP06_SetL = DB90.DV1PCP06.SetLeft; - PlcTemp.DV1PCP07_SetL = DB90.DV1PCP07.SetLeft; - PlcTemp.DV1PCP08_SetL = DB90.DV1PCP08.SetLeft; - PlcTemp.DV1PCP09_SetL = DB90.DV1PCP09.SetLeft; - PlcTemp.DV1PCP10_SetL = DB90.DV1PCP10.SetLeft; - PlcTemp.DV1PCP11_SetL = DB90.DV1PCP11.SetLeft; - PlcTemp.DV1PCP12_SetL = DB90.DV1PCP12.SetLeft; - PlcTemp.DV1PCP13_SetL = DB90.DV1PCP13.SetLeft; - PlcTemp.DV1PCP14_SetL = DB90.DV1PCP14.SetLeft; - PlcTemp.DV1PCP15_SetL = DB90.DV1PCP15.SetLeft; - PlcTemp.DV1PCP16_SetL = DB90.DV1PCP16.SetLeft; - PlcTemp.DV1PCP17_SetL = DB90.DV1PCP17.SetLeft; - PlcTemp.DV1PCP18_SetL = DB90.DV1PCP18.SetLeft; - PlcTemp.DV1PCP19_SetL = DB90.DV1PCP19.SetLeft; - PlcTemp.DV1PCP20_SetL = DB90.DV1PCP20.SetLeft; - - - PlcTemp.DV1PCP01_SetR = DB90.DV1PCP01.SetRight; - PlcTemp.DV1PCP02_SetR = DB90.DV1PCP02.SetRight; - PlcTemp.DV1PCP03_SetR = DB90.DV1PCP03.SetRight; - PlcTemp.DV1PCP04_SetR = DB90.DV1PCP04.SetRight; - PlcTemp.DV1PCP05_SetR = DB90.DV1PCP05.SetRight; - PlcTemp.DV1PCP06_SetR = DB90.DV1PCP06.SetRight; - PlcTemp.DV1PCP07_SetR = DB90.DV1PCP07.SetRight; - PlcTemp.DV1PCP08_SetR = DB90.DV1PCP08.SetRight; - PlcTemp.DV1PCP09_SetR = DB90.DV1PCP09.SetRight; - PlcTemp.DV1PCP10_SetR = DB90.DV1PCP10.SetRight; - PlcTemp.DV1PCP11_SetR = DB90.DV1PCP11.SetRight; - PlcTemp.DV1PCP12_SetR = DB90.DV1PCP12.SetRight; - PlcTemp.DV1PCP13_SetR = DB90.DV1PCP13.SetRight; - PlcTemp.DV1PCP14_SetR = DB90.DV1PCP14.SetRight; - PlcTemp.DV1PCP15_SetR = DB90.DV1PCP15.SetRight; - PlcTemp.DV1PCP16_SetR = DB90.DV1PCP16.SetRight; - PlcTemp.DV1PCP17_SetR = DB90.DV1PCP17.SetRight; - PlcTemp.DV1PCP18_SetR = DB90.DV1PCP18.SetRight; - PlcTemp.DV1PCP19_SetR = DB90.DV1PCP19.SetRight; - PlcTemp.DV1PCP20_SetR = DB90.DV1PCP20.SetRight; + PlcTemp.DV1PCP01_SetL = DB90.DV1PCP01.LeftPosition; + PlcTemp.DV1PCP02_SetL = DB90.DV1PCP02.LeftPosition; + PlcTemp.DV1PCP03_SetL = DB90.DV1PCP03.LeftPosition; + PlcTemp.DV1PCP04_SetL = DB90.DV1PCP04.LeftPosition; + PlcTemp.DV1PCP05_SetL = DB90.DV1PCP05.LeftPosition; + PlcTemp.DV1PCP06_SetL = DB90.DV1PCP06.LeftPosition; + PlcTemp.DV1PCP07_SetL = DB90.DV1PCP07.LeftPosition; + PlcTemp.DV1PCP08_SetL = DB90.DV1PCP08.LeftPosition; + PlcTemp.DV1PCP09_SetL = DB90.DV1PCP09.LeftPosition; + PlcTemp.DV1PCP10_SetL = DB90.DV1PCP10.LeftPosition; + PlcTemp.DV1PCP11_SetL = DB90.DV1PCP11.LeftPosition; + PlcTemp.DV1PCP12_SetL = DB90.DV1PCP12.LeftPosition; + PlcTemp.DV1PCP13_SetL = DB90.DV1PCP13.LeftPosition; + PlcTemp.DV1PCP14_SetL = DB90.DV1PCP14.LeftPosition; + PlcTemp.DV1PCP15_SetL = DB90.DV1PCP15.LeftPosition; + PlcTemp.DV1PCP16_SetL = DB90.DV1PCP16.LeftPosition; + PlcTemp.DV1PCP17_SetL = DB90.DV1PCP17.LeftPosition; + PlcTemp.DV1PCP18_SetL = DB90.DV1PCP18.LeftPosition; + PlcTemp.DV1PCP19_SetL = DB90.DV1PCP19.LeftPosition; + PlcTemp.DV1PCP20_SetL = DB90.DV1PCP20.LeftPosition; + + + PlcTemp.DV1PCP01_SetR = DB90.DV1PCP01.RightPosition; + PlcTemp.DV1PCP02_SetR = DB90.DV1PCP02.RightPosition; + PlcTemp.DV1PCP03_SetR = DB90.DV1PCP03.RightPosition; + PlcTemp.DV1PCP04_SetR = DB90.DV1PCP04.RightPosition; + PlcTemp.DV1PCP05_SetR = DB90.DV1PCP05.RightPosition; + PlcTemp.DV1PCP06_SetR = DB90.DV1PCP06.RightPosition; + PlcTemp.DV1PCP07_SetR = DB90.DV1PCP07.RightPosition; + PlcTemp.DV1PCP08_SetR = DB90.DV1PCP08.RightPosition; + PlcTemp.DV1PCP09_SetR = DB90.DV1PCP09.RightPosition; + PlcTemp.DV1PCP10_SetR = DB90.DV1PCP10.RightPosition; + PlcTemp.DV1PCP11_SetR = DB90.DV1PCP11.RightPosition; + PlcTemp.DV1PCP12_SetR = DB90.DV1PCP12.RightPosition; + PlcTemp.DV1PCP13_SetR = DB90.DV1PCP13.RightPosition; + PlcTemp.DV1PCP14_SetR = DB90.DV1PCP14.RightPosition; + PlcTemp.DV1PCP15_SetR = DB90.DV1PCP15.RightPosition; + PlcTemp.DV1PCP16_SetR = DB90.DV1PCP16.RightPosition; + PlcTemp.DV1PCP17_SetR = DB90.DV1PCP17.RightPosition; + PlcTemp.DV1PCP18_SetR = DB90.DV1PCP18.RightPosition; + PlcTemp.DV1PCP19_SetR = DB90.DV1PCP19.RightPosition; + PlcTemp.DV1PCP20_SetR = DB90.DV1PCP20.RightPosition; PlcTemp.DV1PCP01_AlarmL = DB90.DV1PCP01.AlarmLeftPosition; @@ -591,26 +591,26 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsHelper.SetLjSwith(LjSwitchE.AS1NSI01, PlcTemp.AS1NSI01_Set, PlcTemp.AS1NSI01_Alarm); ControlsHelper.SetLjSwith(LjSwitchE.AS1OSI01, PlcTemp.AS1OSI01_Set, PlcTemp.AS1OSI01_Alarm); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP01, PlcTemp.DV1PCP01_AlarmR, PlcTemp.DV1PCP01_SetR, PlcTemp.DV1PCP01_AlarmL, PlcTemp.DV1PCP01_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP02, PlcTemp.DV1PCP02_AlarmR, PlcTemp.DV1PCP02_SetR, PlcTemp.DV1PCP02_AlarmL, PlcTemp.DV1PCP02_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP03, PlcTemp.DV1PCP03_AlarmR, PlcTemp.DV1PCP03_SetR, PlcTemp.DV1PCP03_AlarmL, PlcTemp.DV1PCP03_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP04, PlcTemp.DV1PCP04_AlarmR, PlcTemp.DV1PCP04_SetR, PlcTemp.DV1PCP04_AlarmL, PlcTemp.DV1PCP04_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP05, PlcTemp.DV1PCP05_AlarmR, PlcTemp.DV1PCP05_SetR, PlcTemp.DV1PCP05_AlarmL, PlcTemp.DV1PCP05_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP06, PlcTemp.DV1PCP06_AlarmR, PlcTemp.DV1PCP06_SetR, PlcTemp.DV1PCP06_AlarmL, PlcTemp.DV1PCP06_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP07, PlcTemp.DV1PCP07_AlarmR, PlcTemp.DV1PCP07_SetR, PlcTemp.DV1PCP07_AlarmL, PlcTemp.DV1PCP07_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP08, PlcTemp.DV1PCP08_AlarmR, PlcTemp.DV1PCP08_SetR, PlcTemp.DV1PCP08_AlarmL, PlcTemp.DV1PCP08_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP09, PlcTemp.DV1PCP09_AlarmR, PlcTemp.DV1PCP09_SetR, PlcTemp.DV1PCP09_AlarmL, PlcTemp.DV1PCP09_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP10, PlcTemp.DV1PCP10_AlarmR, PlcTemp.DV1PCP10_SetR, PlcTemp.DV1PCP10_AlarmL, PlcTemp.DV1PCP10_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP11, PlcTemp.DV1PCP11_AlarmR, PlcTemp.DV1PCP11_SetR, PlcTemp.DV1PCP11_AlarmL, PlcTemp.DV1PCP11_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP12, PlcTemp.DV1PCP12_AlarmR, PlcTemp.DV1PCP12_SetR, PlcTemp.DV1PCP12_AlarmL, PlcTemp.DV1PCP12_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP13, PlcTemp.DV1PCP13_AlarmR, PlcTemp.DV1PCP13_SetR, PlcTemp.DV1PCP13_AlarmL, PlcTemp.DV1PCP13_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP14, PlcTemp.DV1PCP14_AlarmR, PlcTemp.DV1PCP14_SetR, PlcTemp.DV1PCP14_AlarmL, PlcTemp.DV1PCP14_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP15, PlcTemp.DV1PCP15_AlarmR, PlcTemp.DV1PCP15_SetR, PlcTemp.DV1PCP15_AlarmL, PlcTemp.DV1PCP15_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP16, PlcTemp.DV1PCP16_AlarmR, PlcTemp.DV1PCP16_SetR, PlcTemp.DV1PCP16_AlarmL, PlcTemp.DV1PCP16_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP17, PlcTemp.DV1PCP17_AlarmR, PlcTemp.DV1PCP17_SetR, PlcTemp.DV1PCP17_AlarmL, PlcTemp.DV1PCP17_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP18, PlcTemp.DV1PCP18_AlarmR, PlcTemp.DV1PCP18_SetR, PlcTemp.DV1PCP18_AlarmL, PlcTemp.DV1PCP18_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP19, PlcTemp.DV1PCP19_AlarmR, PlcTemp.DV1PCP19_SetR, PlcTemp.DV1PCP19_AlarmL, PlcTemp.DV1PCP19_SetL); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP20, PlcTemp.DV1PCP20_AlarmR, PlcTemp.DV1PCP20_SetR, PlcTemp.DV1PCP20_AlarmL, PlcTemp.DV1PCP20_SetL); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP01, PlcTemp.DV1PCP01_AlarmR, PlcTemp.DV1PCP01_SetR, PlcTemp.DV1PCP01_AlarmL, PlcTemp.DV1PCP01_SetL, 2); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP02, PlcTemp.DV1PCP02_AlarmR, PlcTemp.DV1PCP02_SetR, PlcTemp.DV1PCP02_AlarmL, PlcTemp.DV1PCP02_SetL, 2); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP03, PlcTemp.DV1PCP03_AlarmR, PlcTemp.DV1PCP03_SetR, PlcTemp.DV1PCP03_AlarmL, PlcTemp.DV1PCP03_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP04, PlcTemp.DV1PCP04_AlarmR, PlcTemp.DV1PCP04_SetR, PlcTemp.DV1PCP04_AlarmL, PlcTemp.DV1PCP04_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP05, PlcTemp.DV1PCP05_AlarmR, PlcTemp.DV1PCP05_SetR, PlcTemp.DV1PCP05_AlarmL, PlcTemp.DV1PCP05_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP06, PlcTemp.DV1PCP06_AlarmR, PlcTemp.DV1PCP06_SetR, PlcTemp.DV1PCP06_AlarmL, PlcTemp.DV1PCP06_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP07, PlcTemp.DV1PCP07_AlarmR, PlcTemp.DV1PCP07_SetR, PlcTemp.DV1PCP07_AlarmL, PlcTemp.DV1PCP07_SetL, 2); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP08, PlcTemp.DV1PCP08_AlarmR, PlcTemp.DV1PCP08_SetR, PlcTemp.DV1PCP08_AlarmL, PlcTemp.DV1PCP08_SetL, 2); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP09, PlcTemp.DV1PCP09_AlarmR, PlcTemp.DV1PCP09_SetR, PlcTemp.DV1PCP09_AlarmL, PlcTemp.DV1PCP09_SetL, 1); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP10, PlcTemp.DV1PCP10_AlarmR, PlcTemp.DV1PCP10_SetR, PlcTemp.DV1PCP10_AlarmL, PlcTemp.DV1PCP10_SetL, 1); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP11, PlcTemp.DV1PCP11_AlarmL, PlcTemp.DV1PCP11_SetL, PlcTemp.DV1PCP11_AlarmR, PlcTemp.DV1PCP11_SetR, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP12, PlcTemp.DV1PCP12_AlarmR, PlcTemp.DV1PCP12_SetR, PlcTemp.DV1PCP12_AlarmL, PlcTemp.DV1PCP12_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP13, PlcTemp.DV1PCP13_AlarmR, PlcTemp.DV1PCP13_SetR, true/*PlcTemp.DV1PCP13_AlarmL*/, PlcTemp.DV1PCP13_SetL, 1); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP14, PlcTemp.DV1PCP14_AlarmR, PlcTemp.DV1PCP14_SetR, PlcTemp.DV1PCP14_AlarmL, PlcTemp.DV1PCP14_SetL, 1); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP15, PlcTemp.DV1PCP15_AlarmR, PlcTemp.DV1PCP15_SetR, PlcTemp.DV1PCP15_AlarmL, PlcTemp.DV1PCP15_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP16, PlcTemp.DV1PCP16_AlarmL, PlcTemp.DV1PCP16_SetL, PlcTemp.DV1PCP16_AlarmR, PlcTemp.DV1PCP16_SetR, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP17, PlcTemp.DV1PCP17_AlarmR, PlcTemp.DV1PCP17_SetR, PlcTemp.DV1PCP17_AlarmL, PlcTemp.DV1PCP17_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP18, PlcTemp.DV1PCP18_AlarmR, PlcTemp.DV1PCP18_SetR, PlcTemp.DV1PCP18_AlarmL, PlcTemp.DV1PCP18_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP19, PlcTemp.DV1PCP19_AlarmR, PlcTemp.DV1PCP19_SetR, PlcTemp.DV1PCP19_AlarmL, PlcTemp.DV1PCP19_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP20, PlcTemp.DV1PCP20_AlarmR, PlcTemp.DV1PCP20_SetR, PlcTemp.DV1PCP20_AlarmL, PlcTemp.DV1PCP20_SetL, 0); } @@ -663,7 +663,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver } #endregion - + #region 测试程序 /// diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index e1080ea..47de1fa 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -900,19 +900,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.DV2PCP13_AlarmR = DB2102.DV2PCP13.AlarmRightPosition; - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP01, PlcReadTemp.DV2PCP01_AlarmR, PlcReadTemp.DV2PCP01_SetR, PlcReadTemp.DV2PCP01_AlarmL, PlcReadTemp.DV2PCP01_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP02, PlcReadTemp.DV2PCP02_AlarmR, PlcReadTemp.DV2PCP02_SetR, PlcReadTemp.DV2PCP02_AlarmL, PlcReadTemp.DV2PCP02_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP03, PlcReadTemp.DV2PCP03_AlarmR, PlcReadTemp.DV2PCP03_SetR, PlcReadTemp.DV2PCP03_AlarmL, PlcReadTemp.DV2PCP03_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP04, PlcReadTemp.DV2PCP04_AlarmR, PlcReadTemp.DV2PCP04_SetR, PlcReadTemp.DV2PCP04_AlarmL, PlcReadTemp.DV2PCP04_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP05, PlcReadTemp.DV2PCP05_AlarmR, PlcReadTemp.DV2PCP05_SetR, PlcReadTemp.DV2PCP05_AlarmL, PlcReadTemp.DV2PCP05_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP06, PlcReadTemp.DV2PCP06_AlarmR, PlcReadTemp.DV2PCP06_SetR, PlcReadTemp.DV2PCP06_AlarmL, PlcReadTemp.DV2PCP06_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP07, PlcReadTemp.DV2PCP07_AlarmR, PlcReadTemp.DV2PCP07_SetR, PlcReadTemp.DV2PCP07_AlarmL, PlcReadTemp.DV2PCP07_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP08, PlcReadTemp.DV2PCP08_AlarmR, PlcReadTemp.DV2PCP08_SetR, PlcReadTemp.DV2PCP08_AlarmL, PlcReadTemp.DV2PCP08_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP09, PlcReadTemp.DV2PCP09_AlarmR, PlcReadTemp.DV2PCP09_SetR, PlcReadTemp.DV2PCP09_AlarmL, PlcReadTemp.DV2PCP09_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP10, PlcReadTemp.DV2PCP10_AlarmR, PlcReadTemp.DV2PCP10_SetR, PlcReadTemp.DV2PCP10_AlarmL, PlcReadTemp.DV2PCP10_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP11, PlcReadTemp.DV2PCP11_AlarmR, PlcReadTemp.DV2PCP11_SetR, PlcReadTemp.DV2PCP11_AlarmL, PlcReadTemp.DV2PCP11_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP12, PlcReadTemp.DV2PCP12_AlarmR, PlcReadTemp.DV2PCP12_SetR, PlcReadTemp.DV2PCP12_AlarmL, PlcReadTemp.DV2PCP12_SetL); - ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP13, PlcReadTemp.DV2PCP13_AlarmR, PlcReadTemp.DV2PCP13_SetR, PlcReadTemp.DV2PCP13_AlarmL, PlcReadTemp.DV2PCP13_SetL); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP01, PlcReadTemp.DV2PCP01_AlarmR, PlcReadTemp.DV2PCP01_SetR, PlcReadTemp.DV2PCP01_AlarmL, PlcReadTemp.DV2PCP01_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP02, PlcReadTemp.DV2PCP02_AlarmR, PlcReadTemp.DV2PCP02_SetR, PlcReadTemp.DV2PCP02_AlarmL, PlcReadTemp.DV2PCP02_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP03, PlcReadTemp.DV2PCP03_AlarmR, PlcReadTemp.DV2PCP03_SetR, PlcReadTemp.DV2PCP03_AlarmL, PlcReadTemp.DV2PCP03_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP04, PlcReadTemp.DV2PCP04_AlarmR, PlcReadTemp.DV2PCP04_SetR, PlcReadTemp.DV2PCP04_AlarmL, PlcReadTemp.DV2PCP04_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP05, PlcReadTemp.DV2PCP05_AlarmR, PlcReadTemp.DV2PCP05_SetR, PlcReadTemp.DV2PCP05_AlarmL, PlcReadTemp.DV2PCP05_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP06, PlcReadTemp.DV2PCP06_AlarmR, PlcReadTemp.DV2PCP06_SetR, PlcReadTemp.DV2PCP06_AlarmL, PlcReadTemp.DV2PCP06_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP07, PlcReadTemp.DV2PCP07_AlarmR, PlcReadTemp.DV2PCP07_SetR, PlcReadTemp.DV2PCP07_AlarmL, PlcReadTemp.DV2PCP07_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP08, PlcReadTemp.DV2PCP08_AlarmR, PlcReadTemp.DV2PCP08_SetR, PlcReadTemp.DV2PCP08_AlarmL, PlcReadTemp.DV2PCP08_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP09, PlcReadTemp.DV2PCP09_AlarmR, PlcReadTemp.DV2PCP09_SetR, PlcReadTemp.DV2PCP09_AlarmL, PlcReadTemp.DV2PCP09_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP10, PlcReadTemp.DV2PCP10_AlarmR, PlcReadTemp.DV2PCP10_SetR, PlcReadTemp.DV2PCP10_AlarmL, PlcReadTemp.DV2PCP10_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP11, PlcReadTemp.DV2PCP11_AlarmR, PlcReadTemp.DV2PCP11_SetR, PlcReadTemp.DV2PCP11_AlarmL, PlcReadTemp.DV2PCP11_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP12, PlcReadTemp.DV2PCP12_AlarmR, PlcReadTemp.DV2PCP12_SetR, PlcReadTemp.DV2PCP12_AlarmL, PlcReadTemp.DV2PCP12_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP13, PlcReadTemp.DV2PCP13_AlarmR, PlcReadTemp.DV2PCP13_SetR, PlcReadTemp.DV2PCP13_AlarmL, PlcReadTemp.DV2PCP13_SetL, 0); ControlsHelper.SetLjSwith(SwithE.BU1ASF01, PlcReadTemp.BU1ASF01_Set, PlcReadTemp.BU1ASF01_Alarm); ControlsHelper.SetLjSwith(SwithE.BU1BSF01, PlcReadTemp.BU1BSF01_Set, PlcReadTemp.BU1BSF01_Alarm); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs index 1ed9c0f..4f3a2f4 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/ControlsImprot.cs @@ -202,8 +202,9 @@ namespace Mesnac.Action.ChemicalWeighing.Util /// /// /// - public static void SetThreeWayValve(ThreeWayValve obj, bool alarmr, bool setr, bool alarml, bool setl) + public static void SetThreeWayValve(ThreeWayValve obj, bool alarmr, bool setr, bool alarml, bool setl, int kind) { + obj.ControlKind = kind; obj.ZLTValue = setr; obj.ZLDValue = setl; obj.ALMTValue = alarmr; diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj index 74264b7..62ade74 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj +++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj @@ -699,6 +699,20 @@ + + + + + + + + + + + + + + diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL0.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL0.png new file mode 100644 index 0000000..6f0ecc9 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL0.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL1.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL1.png new file mode 100644 index 0000000..e0d32f0 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL1.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL2.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL2.png new file mode 100644 index 0000000..f1bcbfc Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveL2.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLAll.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLAll.png new file mode 100644 index 0000000..2c57284 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLAll.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLHError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLHError.png new file mode 100644 index 0000000..9e07414 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLHError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLHVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLHVError.png new file mode 100644 index 0000000..ef01e48 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLHVError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLVError.png new file mode 100644 index 0000000..7ba918f Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveLVError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR0.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR0.png new file mode 100644 index 0000000..8f6e92a Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR0.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR1.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR1.png new file mode 100644 index 0000000..806b78e Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR1.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR2.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR2.png new file mode 100644 index 0000000..dde1ab8 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveR2.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRAll.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRAll.png new file mode 100644 index 0000000..07b98d4 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRAll.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRHError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRHError.png new file mode 100644 index 0000000..7a1325f Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRHError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRHVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRHVError.png new file mode 100644 index 0000000..e56a720 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRHVError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRVError.png new file mode 100644 index 0000000..48338ab Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveRVError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs b/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs index ae68c84..07a37a1 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs +++ b/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs @@ -18,10 +18,13 @@ namespace Mesnac.Controls.ChemicalWeighing } private string[] sImages = new String[7]; + private string[] sImagesL = new String[7]; + private string[] sImagesR = new String[7]; private bool _zltValue; private bool _zldValue; private bool _almtValue; private bool _almdValue; + private int _controlKind; /// /// 杨威 @@ -46,18 +49,46 @@ namespace Mesnac.Controls.ChemicalWeighing sImages[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveHVError.png"; //三个都通 sImages[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveAll.png"; - + + sImagesL[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveL0.png"; + //直通 + sImagesL[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveL1.png"; + //斜通 + sImagesL[2] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveL2.png"; + //直通报警通知 + sImagesL[3] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveLHError.png"; + //斜通报警通知 + sImagesL[4] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveLVError.png"; + //都报警 + sImagesL[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveLHVError.png"; + //三个都通 + sImagesL[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveLAll.png"; + + sImagesR[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveR0.png"; + //直通 + sImagesR[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveR1.png"; + //斜通 + sImagesR[2] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveR2.png"; + //直通报警通知 + sImagesR[3] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveRHError.png"; + //斜通报警通知 + sImagesR[4] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveRVError.png"; + //都报警 + sImagesR[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveRHVError.png"; + //三个都通 + sImagesR[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveRAll.png"; + } - + private void ReloadStream() { - + int defaultIndex = 0; //如果出现报警 就去判断是直还是斜 - + //直报警 斜报警 if (_almtValue && _almdValue) @@ -100,17 +131,31 @@ namespace Mesnac.Controls.ChemicalWeighing defaultIndex = 6; } } - - - _imageStream = _assembly.GetManifestResourceStream(sImages[defaultIndex]); - + + switch (_controlKind) + { + case 0: + _imageStream = _assembly.GetManifestResourceStream(sImages[defaultIndex]); + break; + case 1: + _imageStream = _assembly.GetManifestResourceStream(sImagesL[defaultIndex]); + break; + case 2: + _imageStream = _assembly.GetManifestResourceStream(sImagesR[defaultIndex]); + break; + default: + _imageStream = _assembly.GetManifestResourceStream(sImages[defaultIndex]); + break; + } + + } - + private void Reload() { - if ( _imageStream != null ) + if (_imageStream != null) { - Image img = Image.FromStream( _imageStream); + Image img = Image.FromStream(_imageStream); pictureBox1.Image = img; pictureBox1.Refresh(); } @@ -139,10 +184,11 @@ namespace Mesnac.Controls.ChemicalWeighing get => _zltValue; set { - if(_zltValue != value) { + if (_zltValue != value) + { _zltValue = value; R(); - } + } } } @@ -159,7 +205,8 @@ namespace Mesnac.Controls.ChemicalWeighing get => _zldValue; set { - if( _zldValue != value ) { + if (_zldValue != value) + { _zldValue = value; R(); } @@ -169,7 +216,7 @@ namespace Mesnac.Controls.ChemicalWeighing /// /// 协通报警 /// - public string ALMTName { get; set;} + public string ALMTName { get; set; } /// /// 协通报警Value @@ -179,11 +226,12 @@ namespace Mesnac.Controls.ChemicalWeighing get => _almtValue; set { - if( _almtValue != value ) { + if (_almtValue != value) + { _almtValue = value; R(); } - + } } @@ -200,11 +248,28 @@ namespace Mesnac.Controls.ChemicalWeighing get => _almdValue; set { - if( _almdValue != value ) { + if (_almdValue != value) + { _almdValue = value; - R(); + R(); } } } + + /// + /// 控件种类 0斜通在下 1斜通在左 2斜通在右 + /// + public int ControlKind + { + get => _controlKind; + set + { + if (_controlKind != value) + { + _controlKind = value; + R(); + } + } + } } } \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 51adb43..059cc9b 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1,6 +1,96 @@ + + + + + + 501, 236 + DV1PCP10 + 13, 22 + + + + + + + 501, 263 + DV1PCP09 + 13, 22 + + + + + + + 467, 208 + DV1PCP02 + 13, 22 + + + + + + + 467, 237 + DV1PCP01 + 13, 22 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1572, 181 + SpecialLabelBlue504 + 3, 43 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1530, 181 + SpecialLabelBlue505 + 43, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1483, 19 + SpecialLabelBlue506 + 3, 136 + 23, 874 AlarmMoveText @@ -202,7 +292,7 @@ True 0 White - 1517, 414 + 1551, 415 HR1OSI02 11, 12 @@ -222,7 +312,7 @@ True 0 White - 1430, 416 + 1464, 417 HR1NSI02 11, 12 @@ -242,7 +332,7 @@ True 0 White - 1371, 416 + 1405, 417 HR1MSI02 11, 12 @@ -262,7 +352,7 @@ True 0 White - 1312, 416 + 1346, 417 HR1LSI02 11, 12 @@ -282,7 +372,7 @@ True 0 White - 1253, 416 + 1287, 420 HR1KSI02 11, 12 @@ -549,48 +639,12 @@ DV1PCP04 22, 12 - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 596, 84 - SpecialLabelBlue509 - 26, 1 - - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 596, 85 - SpecialLabelBlue510 - 1, 28 - - 1259, 68 + 1293, 67 DV1PCP20 22, 12 @@ -610,7 +664,7 @@ White 584, 72 SpecialLabelBlue511 - 752, 3 + 786, 3 @@ -661,7 +715,7 @@ zsTurnOff - 1632, 115 + 1651, 108 Fan17 10, 10 @@ -697,7 +751,7 @@ True MiddleCenter White - 1648, 98 + 1667, 91 SpecialLabelBlue697 2, 24 @@ -705,7 +759,7 @@ zsTurnOff - 1608, 113 + 1627, 106 Fan18 10, 10 @@ -723,7 +777,7 @@ True MiddleCenter White - 1627, 60 + 1646, 53 SpecialLabelBlue696 15, 2 @@ -741,7 +795,7 @@ True MiddleCenter White - 1627, 60 + 1646, 53 SpecialLabelBlue695 2, 62 @@ -759,7 +813,7 @@ True MiddleCenter White - 1600, 120 + 1619, 113 SpecialLabelBlue694 29, 2 @@ -777,7 +831,7 @@ True MiddleCenter White - 1598, 52 + 1617, 45 SpecialLabelBlue693 65, 2 @@ -795,7 +849,7 @@ True MiddleCenter White - 1597, 52 + 1616, 45 SpecialLabelBlue692 2, 62 @@ -813,24 +867,24 @@ True MiddleCenter White - 1585, 66 + 1604, 59 SpecialLabelBlue691 55, 2 - 1640, 60 + 1659, 53 SheBei1 25, 40 - 1559, 63 + 1578, 56 MoFenJi1 44, 72 142, 196, 216 20 - 1479, 92 + 1498, 85 HslConveyer2147483646 84, 30 @@ -839,7 +893,7 @@ - 1379, 15 + 1413, 15 DV1PCP18 22, 12 @@ -855,7 +909,7 @@ - 563, 358 + 563, 852 AS1PCP03 14, 12 @@ -873,13 +927,13 @@ True MiddleCenter 128, 255, 128 - 1559, 140 + 1593, 140 SpecialLabelBlue690 3, 83 ylNormal - 1530, 452 + 1564, 453 DM1OSF01 36, 10 @@ -899,7 +953,7 @@ True 0 White - 1517, 285 + 1551, 286 HR1OSI01 11, 12 @@ -919,26 +973,26 @@ True 0 White - 1517, 238 + 1551, 239 PR1OSI01 11, 12 - 1537, 398 + 1571, 399 LSiloO 10, 10 - 1537, 261 + 1571, 262 HSiloO 10, 10 - 1556, 223 + 1590, 224 AS1OSI01 14, 12 @@ -951,7 +1005,7 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1517, 220 + 1551, 221 Bottle15 46, 237 @@ -1131,7 +1185,7 @@ True MiddleCenter 128, 255, 128 - 1293, 139 + 1327, 140 SpecialLabelBlue680 3, 14 @@ -1149,7 +1203,7 @@ True MiddleCenter 128, 255, 128 - 1352, 140 + 1386, 141 SpecialLabelBlue679 3, 14 @@ -1167,7 +1221,7 @@ True MiddleCenter 128, 255, 128 - 1411, 139 + 1445, 140 SpecialLabelBlue678 3, 14 @@ -1185,7 +1239,7 @@ True MiddleCenter 128, 255, 128 - 1471, 137 + 1505, 141 SpecialLabelBlue677 3, 14 @@ -1223,7 +1277,7 @@ 128, 255, 128 581, 137 SpecialLabelBlue675 - 981, 3 + 1015, 3 @@ -1239,7 +1293,7 @@ True MiddleCenter White - 1273, 75 + 1307, 76 SpecialLabelBlue674 3, 80 @@ -1257,7 +1311,7 @@ True MiddleCenter White - 1333, 72 + 1367, 73 SpecialLabelBlue673 3, 83 @@ -1284,7 +1338,7 @@ True MiddleCenter White - 1391, 18 + 1425, 19 SpecialLabelBlue669 3, 138 @@ -1324,45 +1378,27 @@ SpecialLabelBlue666 3, 132 - - - - - - False - - - - None - True - True - MiddleCenter - White - 1450, 18 - SpecialLabelBlue665 - 3, 136 - ylNormal - 1442, 458 + 1476, 459 DM1NSF01 43, 10 ylNormal - 1382, 456 + 1416, 457 DM1MSF01 43, 10 ylNormal - 1324, 456 + 1358, 457 DM1LSF01 43, 10 ylNormal - 1265, 456 + 1299, 457 DM1KSF01 43, 10 @@ -1382,7 +1418,7 @@ True 0 White - 1430, 215 + 1464, 216 HR1NSI01 11, 12 @@ -1402,62 +1438,62 @@ True 0 White - 1430, 168 + 1464, 169 PR1NSI01 11, 12 - 1268, 401 + 1302, 402 LSiloK 13, 13 - 1328, 401 + 1362, 402 LSiloL 13, 13 - 1388, 401 + 1422, 402 LSiloM 13, 13 - 1446, 400 + 1480, 401 LSiloN 13, 13 - 1446, 192 + 1480, 193 HSiloN 13, 13 - 1388, 192 + 1422, 193 HSiloM 13, 13 - 1328, 192 + 1362, 193 HSiloL 13, 13 - 1268, 191 + 1302, 192 HSiloK 13, 13 - 1465, 154 + 1499, 155 AS1NSI01 14, 12 @@ -1470,14 +1506,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1426, 151 + 1460, 152 Bottle14 53, 308 - 1406, 154 + 1440, 155 AS1MSI01 14, 12 @@ -1497,7 +1533,7 @@ True 0 White - 1371, 215 + 1405, 216 HR1MSI01 11, 12 @@ -1517,7 +1553,7 @@ True 0 White - 1371, 168 + 1405, 169 PR1MSI01 11, 12 @@ -1530,14 +1566,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1367, 151 + 1401, 152 Bottle13 53, 308 - 1347, 154 + 1381, 155 AS1LSI01 14, 12 @@ -1557,7 +1593,7 @@ True 0 White - 1312, 215 + 1346, 216 HR1LSI01 11, 12 @@ -1577,7 +1613,7 @@ True 0 White - 1312, 168 + 1346, 169 PR1LSI01 11, 12 @@ -1590,14 +1626,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1308, 151 + 1342, 152 Bottle12 53, 308 - 1288, 154 + 1322, 155 AS1KSI01 14, 12 @@ -1617,7 +1653,7 @@ True 0 White - 1261, 215 + 1295, 216 HR1KSI01 11, 12 @@ -1637,7 +1673,7 @@ True 0 White - 1253, 168 + 1287, 172 PR1KSI01 11, 12 @@ -1650,7 +1686,7 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1249, 151 + 1283, 152 Bottle11 53, 308 @@ -1816,24 +1852,6 @@ SpecialLabelBlue658 3, 51 - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 527, 112 - SpecialLabelBlue656 - 95, 1 - @@ -1852,24 +1870,6 @@ SpecialLabelBlue657 284, 3 - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 568, 60 - SpecialLabelBlue655 - 54, 1 - @@ -1888,24 +1888,6 @@ SpecialLabelBlue654 397, 3 - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 485, 32 - SpecialLabelBlue653 - 138, 1 - @@ -1922,19 +1904,19 @@ White 468, 18 SpecialLabelBlue652 - 983, 3 + 1018, 3 - 523, 114 + 522, 571 AS1PCP02 14, 12 - 480, 48 + 481, 286 AS1PCP01 14, 12 @@ -2057,7 +2039,7 @@ 541, 407 DV1PCP14 - 22, 12 + 13, 22 @@ -2066,43 +2048,25 @@ 541, 434 DV1PCP13 - 22, 12 + 13, 22 - 499, 378 + 507, 378 DV1PCP08 - 22, 12 + 13, 22 - 499, 407 + 507, 407 DV1PCP07 - 22, 12 - - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 568, 61 - SpecialLabelBlue642 - 1, 803 + 13, 22 @@ -2194,24 +2158,6 @@ SpecialLabelBlue632 22, 3 - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 527, 113 - SpecialLabelBlue631 - 1, 471 - @@ -2230,24 +2176,6 @@ SpecialLabelBlue630 3, 467 - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 485, 32 - SpecialLabelBlue629 - 1, 266 - @@ -2270,7 +2198,7 @@ zsTurnOff - 1680, 21 + 1699, 14 Fan19 10, 10 @@ -2288,7 +2216,7 @@ True MiddleCenter Aqua - 1674, 68 + 1693, 61 SpecialLabelBlue627 1, 16 @@ -2403,7 +2331,7 @@ - 330, 857 + 327, 855 AS3DBT07 14, 12 @@ -2968,7 +2896,7 @@ - 330, 576 + 330, 575 AS2DBT07 14, 12 @@ -3497,7 +3425,7 @@ - 330, 292 + 329, 290 AS1DBT07 14, 12 @@ -4602,47 +4530,11 @@ Bottle1 53, 308 - - - - - - 500, 239 - DV1PCP10 - 22, 12 - - - - - - - 500, 266 - DV1PCP09 - 22, 12 - - 1659, 29 + 1678, 22 Dou27 30, 40 - - - - - - 458, 209 - DV1PCP02 - 22, 12 - - - - - - - 458, 238 - DV1PCP01 - 22, 12 - 343, 285 Xie17