From 7d77bbea6aa7ed7b4edf779b0ed42f0ef4fb1426 Mon Sep 17 00:00:00 2001 From: wangsr Date: Thu, 28 Dec 2023 14:39:58 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E9=87=8D=E6=9E=84=E8=BE=93=E9=80=81?= =?UTF-8?q?=E7=A3=A8=E7=B2=89=E7=B3=BB=E7=BB=9F=20=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=82=B9=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjDeliver/DeliverInitAction.cs | 62 +- .../LjDeliver/Entity/DeliverEntity.cs | 10 + .../LjDeliver/Entity/PlcTempEntity.cs | 19 +- .../Data/MCProject/nodeForm/LjDeliver.xml | 987 +++++++++--------- 4 files changed, 601 insertions(+), 477 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index 36c50b0..e9cd72c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -81,6 +81,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver /// HslCurve PressureCurve; + /// + /// 传送带 + /// + HslConveyer Conveyer; + #endregion #endregion @@ -95,6 +100,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver AlarmMoveText = Controls.FirstOrDefault(x => x != null && x.Name == "AlarmMoveText") as HslMoveText; PressureCurve = Controls.FirstOrDefault(x => x.Name == "PressureCurve") as HslCurve; + Conveyer = Controls.FirstOrDefault(x => x.Name == "Conveyer") as HslConveyer; SetAllControls(); @@ -484,6 +490,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.DM1DSIG01_Alarm = DB91.DM1DSIG01.Alarm; PlcTemp.DM1ESIG01_Alarm = DB91.DM1ESIG01.Alarm; + PlcTemp.DM1GDS01_Set = DB91.DM1GDS01.Running; + PlcTemp.DM1GDS02_Set = DB91.DM1GDS02.Running; + PlcTemp.DM1GDS03_Set = DB91.DM1GDS03.Running; + PlcTemp.DM1GDS04_Set = DB91.DM1GDS04.Running; + PlcTemp.DM1GDS05_Set = DB91.DM1GDS05.Running; + PlcTemp.DM1GDS06_Set = DB91.DM1GDS06.Running; + PlcTemp.DM1GDS09_Set = DB91.DM1GDS09.Running; + PlcTemp.DM1GDS12_Set = DB91.DM1GDS12.Running; + PlcTemp.DM1GDS01_Alarm = DB91.DM1GDS01.Alarm; + PlcTemp.DM1GDS02_Alarm = DB91.DM1GDS02.Alarm; + PlcTemp.DM1GDS03_Alarm = DB91.DM1GDS03.Alarm; + PlcTemp.DM1GDS04_Alarm = DB91.DM1GDS04.Alarm; + PlcTemp.DM1GDS05_Alarm = DB91.DM1GDS05.Alarm; + PlcTemp.DM1GDS06_Alarm = DB91.DM1GDS06.Alarm; + PlcTemp.DM1GDS09_Alarm = DB91.DM1GDS09.Alarm; + PlcTemp.DM1GDS12_Alarm = DB91.DM1GDS12.Alarm; + } private void DBOtherGetData() @@ -793,6 +816,38 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsHelper.SetFan(FanE.DM1ESIG01, PlcTemp.DM1ESIG01_Set, PlcTemp.DM1ESIG01_Alarm); ControlsHelper.SetFan(FanE.DM1GDP01, PlcTemp.DM1GDP01_Set, PlcTemp.DM1GDP01_Alarm); + ControlsHelper.SetFan(FanE.DM1GDS01, PlcTemp.DM1GDS01_Set, PlcTemp.DM1GDS01_Alarm); + ControlsHelper.SetFan(FanE.DM1GDS02, PlcTemp.DM1GDS02_Set, PlcTemp.DM1GDS02_Alarm); + ControlsHelper.SetFan(FanE.DM1GDS03, PlcTemp.DM1GDS03_Set, PlcTemp.DM1GDS03_Alarm); + ControlsHelper.SetFan(FanE.DM1GDS06, PlcTemp.DM1GDS06_Set, PlcTemp.DM1GDS06_Alarm); + ControlsHelper.SetFan(FanE.DM1GDS09, PlcTemp.DM1GDS09_Set, PlcTemp.DM1GDS09_Alarm); + ControlsHelper.SetFan(FanE.DM1GDS12, PlcTemp.DM1GDS12_Set, PlcTemp.DM1GDS12_Alarm); + + //传送带是否有报警 + if(PlcTemp.DM1GDS04_Alarm || PlcTemp.DM1GDS05_Alarm) + { + ControlsHelper.SetSwitchLight(SwitchlightE.DM1GDS45, false, true); + Conveyer.MoveSpeed = 0; + } + else if(PlcTemp.DM1GDS04_Set || PlcTemp.DM1GDS05_Set) + { + ControlsHelper.SetSwitchLight(SwitchlightE.DM1GDS45, true); + //传送带正反运转判断 + if (PlcTemp.DM1GDS04_Set) + { + Conveyer.MoveSpeed = 2f; + } + else + { + Conveyer.MoveSpeed = -2f; + } + } + else //传送带没有运转信号 + { + ControlsHelper.SetSwitchLight(SwitchlightE.DM1GDS45, false); + Conveyer.MoveSpeed = 0; + } + } private void DBOtherSetData() @@ -868,11 +923,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsHelper.SetHslBottle(bottleE.Bottle14, PlcTemp.Bottle14_Set); ControlsHelper.SetHslBottle(bottleE.Bottle15, PlcTemp.Bottle15_Set); - var dic = DaCangFactory.GetDefault(); - - - ControlsImprot.SetMCLabel(LabelE.HslBottleValue1, JiSuan(PlcTemp.Bottle1_Set, dic["小料1"]) + "t"); ControlsImprot.SetMCLabel(LabelE.HslBottleValue2, JiSuan(PlcTemp.Bottle2_Set, dic["小料2"]) + "t"); ControlsImprot.SetMCLabel(LabelE.HslBottleValue3, JiSuan(PlcTemp.Bottle3_Set, dic["木粉"]) + "t"); @@ -890,7 +941,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsImprot.SetMCLabel(LabelE.HslBottleValue15, JiSuan(PlcTemp.Bottle15_Set, dic["小料1"]) + "t"); } - public string JiSuan(double x, DaCangValue daCangValue) { var bottleValue3 = Math.Round(x * daCangValue.volume * daCangValue.Density, 2)/100; @@ -902,8 +952,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver return entity; } - - #endregion #region 报警管理 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs index ac30344..7090a71 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs @@ -229,6 +229,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public SwitchLight HighLevel2 { get; set; } public SwitchLight HighLevel3 { get; set; } public SwitchLight AlarmIndicate { get; set; } + + public SwitchLight DM1GDS45 { get; set; } } @@ -293,6 +295,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public Fan DM1CSIG01 { get; set; } public Fan DM1DSIG01 { get; set; } public Fan DM1ESIG01 { get; set; } + + public Fan DM1GDS01 { get; set; } + public Fan DM1GDS02 { get; set; } + public Fan DM1GDS03 { get; set; } + public Fan DM1GDS06 { get; set; } + public Fan DM1GDS09 { get; set; } + public Fan DM1GDS12 { get; set; } + } internal class SpecialLabelBlueEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs index e9a8592..eb985c9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs @@ -1,4 +1,5 @@ -using Mesnac.Controls.ChemicalWeighing; +using DevExpress.XtraPrinting.Export.Pdf; +using Mesnac.Controls.ChemicalWeighing; using Mesnac.Controls.Default; using Mesnac.Controls.Feeding; using System; @@ -388,6 +389,22 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public bool[] Steps6 { get; set; } public bool[] Status { get; set; } + public bool DM1GDS01_Set { get; set; } + public bool DM1GDS02_Set { get; set; } + public bool DM1GDS03_Set { get; set; } + public bool DM1GDS06_Set { get; set; } + public bool DM1GDS09_Set { get; set; } + public bool DM1GDS12_Set { get; set; } + public bool DM1GDS04_Set { get; set; } + public bool DM1GDS05_Set { get; set; } + public bool DM1GDS01_Alarm { get; set; } + public bool DM1GDS02_Alarm { get; set; } + public bool DM1GDS03_Alarm { get; set; } + public bool DM1GDS06_Alarm { get; set; } + public bool DM1GDS09_Alarm { get; set; } + public bool DM1GDS12_Alarm { get; set; } + public bool DM1GDS04_Alarm { get; set; } + public bool DM1GDS05_Alarm { get; set; } } } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 19269d7..74c39cb 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1,6 +1,263 @@ + + + 1732, 291 + DM1GDS45 + 13, 13 + + + + + zsTurnOff + 1886, 173 + DM1GDS03 + 19, 19 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1878, 186 + SpecialLabelBlue464 + 3, 118 + + + Silver + 2 + 10 + 1693, 279 + Conveyer + 90, 36 + + + + + zsTurnOff + 1848, 196 + DM1GDS02 + 19, 19 + + + + + zsTurnOff + 1848, 292 + DM1GDS09 + 19, 19 + + + + + zsTurnOff + 1796, 231 + DM1GDS01 + 19, 19 + + + + + zsTurnOff + 1797, 311 + DM1GDS06 + 19, 19 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1836, 263 + SpecialLabelBlue465 + 3, 39 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1856, 42 + SpecialLabelBlue468 + 3, 22 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1856, 41 + SpecialLabelBlue467 + 25, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1878, 43 + SpecialLabelBlue469 + 3, 136 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1830, 301 + SpecialLabelBlue470 + 51, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1804, 81 + SpecialLabelBlue471 + 3, 98 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1805, 81 + SpecialLabelBlue473 + 30, 3 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1804, 186 + SpecialLabelBlue472 + 3, 64 + + + + + zsTurnOff + 1848, 149 + DM1GDS12 + 19, 19 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1856, 142 + SpecialLabelBlue474 + 3, 41 + + + 1830, 213 + SheBei1 + 50, 56 + + + 1781, 245 + MoFenJi1 + 51, 73 + + + 1835, 64 + Fay1 + 36, 79 + @@ -18,18 +275,18 @@ 报警指示 宋体, 9pt ButtonHighlight - 1804, 876 + 1780, 876 MCLabel238 53, 12 - 1868, 869 + 1844, 869 AlarmIndicate 27, 28 - 37, 869 + 13, 869 AlarmMoveText 1750, 30 @@ -49,14 +306,14 @@ True 0 White - 624, 852 + 600, 852 PR1PCP03 11, 12 - 682, 852 + 658, 852 AS1PCP03 14, 12 @@ -76,12 +333,12 @@ Aqua 127, 864 SpecialLabelBlue599 - 561, 1 + 537, 1 - 672, 483 + 648, 483 PressureCurve - 1240, 382 + 1249, 382 @@ -100,7 +357,7 @@ 0 Transparent White - 1676, 331 + 1652, 331 HslBottleValue15 11, 12 @@ -121,7 +378,7 @@ 0 Transparent White - 1049, 292 + 1025, 292 HslBottleValue6 11, 12 @@ -142,7 +399,7 @@ 0 Transparent White - 990, 292 + 966, 292 HslBottleValue5 11, 12 @@ -163,7 +420,7 @@ 0 Transparent White - 1590, 292 + 1566, 292 HslBottleValue14 11, 12 @@ -184,7 +441,7 @@ 0 Transparent White - 1531, 292 + 1507, 292 HslBottleValue13 11, 12 @@ -205,7 +462,7 @@ 0 Transparent White - 1472, 292 + 1448, 292 HslBottleValue12 11, 12 @@ -226,7 +483,7 @@ 0 Transparent White - 1413, 292 + 1389, 292 HslBottleValue11 11, 12 @@ -247,7 +504,7 @@ 0 Transparent White - 1319, 292 + 1295, 292 HslBottleValue10 11, 12 @@ -268,7 +525,7 @@ 0 Transparent White - 1260, 292 + 1236, 292 HslBottleValue9 11, 12 @@ -289,7 +546,7 @@ 0 Transparent White - 1201, 292 + 1177, 292 HslBottleValue8 11, 12 @@ -310,7 +567,7 @@ 0 Transparent White - 1142, 292 + 1118, 292 HslBottleValue7 11, 12 @@ -331,7 +588,7 @@ 0 Transparent White - 896, 292 + 872, 292 HslBottleValue4 11, 12 @@ -352,7 +609,7 @@ 0 Transparent White - 837, 292 + 813, 292 HslBottleValue3 11, 12 @@ -373,7 +630,7 @@ 0 Transparent White - 778, 292 + 754, 292 HslBottleValue2 11, 12 @@ -394,7 +651,7 @@ 0 Transparent White - 719, 292 + 695, 292 HslBottleValue1 11, 12 @@ -653,7 +910,7 @@ 340, 736 MCPanelBlack3 - 234, 83 + 217, 83 @@ -910,7 +1167,7 @@ 340, 455 MCPanelBlack2 - 234, 83 + 217, 83 @@ -1167,7 +1424,7 @@ 340, 171 MCPanelBlack1 - 234, 83 + 217, 83 @@ -1183,7 +1440,7 @@ True MiddleCenter Aqua - 556, 24 + 532, 24 SpecialLabelBlue475 16, 1 @@ -1191,7 +1448,7 @@ zsTurnOff - 559, 46 + 535, 46 DM1GDP01 25, 25 @@ -1209,7 +1466,7 @@ True MiddleCenter Aqua - 571, 24 + 547, 24 SpecialLabelBlue476 1, 67 @@ -1247,7 +1504,7 @@ True 0 White - 585, 571 + 561, 571 PR1PCP02 11, 12 @@ -1267,7 +1524,7 @@ True 0 White - 543, 286 + 519, 286 PR1PCP01 11, 12 @@ -1309,12 +1566,12 @@ True MiddleCenter Aqua - 571, 90 + 547, 90 SpecialLabelBlue478 129, 1 - 528, 17 + 504, 17 SheBei2 46, 51 @@ -1322,7 +1579,7 @@ zsTurnOff - 1661, 151 + 1637, 151 DM1ESIG01 19, 19 @@ -1330,7 +1587,7 @@ zsTurnOff - 1643, 95 + 1619, 95 DM1DSIG01 19, 19 @@ -1338,7 +1595,7 @@ zsTurnOff - 1373, 95 + 1349, 95 DM1CSIG01 19, 19 @@ -1346,7 +1603,7 @@ zsTurnOff - 1104, 95 + 1080, 95 DM1BSIG01 19, 19 @@ -1354,7 +1611,7 @@ zsTurnOff - 950, 95 + 926, 95 DM1ASIG01 19, 19 @@ -1372,7 +1629,7 @@ True MiddleCenter Aqua - 1040, 119 + 1016, 119 SpecialLabelBlue482 1, 35 @@ -1390,7 +1647,7 @@ True MiddleCenter Aqua - 981, 119 + 957, 119 SpecialLabelBlue481 1, 35 @@ -1408,7 +1665,7 @@ True MiddleCenter Aqua - 981, 118 + 957, 118 SpecialLabelBlue480 133, 1 @@ -1426,7 +1683,7 @@ True MiddleCenter Aqua - 1113, 91 + 1089, 91 SpecialLabelBlue479 1, 28 @@ -1444,7 +1701,7 @@ True MiddleCenter Aqua - 1579, 119 + 1555, 119 SpecialLabelBlue488 1, 37 @@ -1462,7 +1719,7 @@ True MiddleCenter Aqua - 1520, 119 + 1496, 119 SpecialLabelBlue487 1, 37 @@ -1480,7 +1737,7 @@ True MiddleCenter Aqua - 1461, 119 + 1437, 119 SpecialLabelBlue486 1, 36 @@ -1498,7 +1755,7 @@ True MiddleCenter Aqua - 1402, 119 + 1378, 119 SpecialLabelBlue485 1, 36 @@ -1516,7 +1773,7 @@ True MiddleCenter Aqua - 1402, 118 + 1378, 118 SpecialLabelBlue484 251, 1 @@ -1534,7 +1791,7 @@ True MiddleCenter Aqua - 1652, 91 + 1628, 91 SpecialLabelBlue483 1, 28 @@ -1552,7 +1809,7 @@ True MiddleCenter Aqua - 1309, 119 + 1285, 119 SpecialLabelBlue494 1, 37 @@ -1570,7 +1827,7 @@ True MiddleCenter Aqua - 1250, 119 + 1226, 119 SpecialLabelBlue493 1, 37 @@ -1588,7 +1845,7 @@ True MiddleCenter Aqua - 1191, 119 + 1167, 119 SpecialLabelBlue492 1, 36 @@ -1606,7 +1863,7 @@ True MiddleCenter Aqua - 1132, 119 + 1108, 119 SpecialLabelBlue491 1, 36 @@ -1624,7 +1881,7 @@ True MiddleCenter Aqua - 1132, 118 + 1108, 118 SpecialLabelBlue490 251, 1 @@ -1642,7 +1899,7 @@ True MiddleCenter Aqua - 1382, 91 + 1358, 91 SpecialLabelBlue489 1, 28 @@ -1660,7 +1917,7 @@ True MiddleCenter Aqua - 886, 119 + 862, 119 SpecialLabelBlue496 1, 35 @@ -1678,7 +1935,7 @@ True MiddleCenter Aqua - 827, 119 + 803, 119 SpecialLabelBlue495 1, 35 @@ -1696,7 +1953,7 @@ True MiddleCenter Aqua - 767, 119 + 743, 119 SpecialLabelBlue497 1, 34 @@ -1714,7 +1971,7 @@ True MiddleCenter Aqua - 709, 119 + 685, 119 SpecialLabelBlue498 1, 34 @@ -1732,7 +1989,7 @@ True MiddleCenter Aqua - 709, 118 + 685, 118 SpecialLabelBlue499 251, 1 @@ -1750,7 +2007,7 @@ True MiddleCenter Aqua - 959, 91 + 935, 91 SpecialLabelBlue500 1, 28 @@ -1768,7 +2025,7 @@ True MiddleCenter Aqua - 1670, 90 + 1646, 90 SpecialLabelBlue501 1, 135 @@ -1786,112 +2043,112 @@ True MiddleCenter Aqua - 812, 90 + 788, 90 SpecialLabelBlue502 858, 1 TurnOff - 1665, 224 + 1641, 224 Cabinet15 11, 14 TurnOff - 1574, 156 + 1550, 156 Cabinet14 11, 14 TurnOff - 1515, 156 + 1491, 156 Cabinet13 11, 14 TurnOff - 1456, 155 + 1432, 155 Cabinet12 11, 14 TurnOff - 1397, 155 + 1373, 155 Cabinet11 11, 14 TurnOff - 1304, 156 + 1280, 156 Cabinet10 11, 14 TurnOff - 1245, 156 + 1221, 156 Cabinet9 11, 14 TurnOff - 1186, 155 + 1162, 155 Cabinet8 11, 14 TurnOff - 1127, 155 + 1103, 155 Cabinet7 11, 14 TurnOff - 1035, 154 + 1011, 154 Cabinet6 11, 14 TurnOff - 976, 154 + 952, 154 Cabinet5 11, 14 TurnOff - 881, 154 + 857, 154 Cabinet4 11, 14 TurnOff - 822, 154 + 798, 154 Cabinet3 11, 14 TurnOff - 763, 153 + 739, 153 Cabinet2 11, 14 TurnOff - 704, 153 + 680, 153 Cabinet1 11, 14 @@ -2162,7 +2419,7 @@ - 1201, 50 + 1177, 50 DV1PCP19 22, 12 @@ -2171,7 +2428,7 @@ - 1142, 51 + 1118, 51 DV1PCP06 22, 12 @@ -2180,7 +2437,7 @@ - 1411, 50 + 1387, 50 DV1PCP20 22, 12 @@ -2237,7 +2494,7 @@ True MiddleCenter White - 717, 77 + 693, 77 SpecialLabelBlue503 3, 13 @@ -2246,7 +2503,7 @@ - 620, 236 + 596, 236 DV1PCP10 13, 22 @@ -2255,7 +2512,7 @@ - 620, 273 + 596, 273 DV1PCP09 13, 22 @@ -2264,7 +2521,7 @@ - 586, 208 + 562, 208 DV1PCP02 13, 22 @@ -2273,7 +2530,7 @@ - 586, 245 + 562, 245 DV1PCP01 13, 22 @@ -2291,7 +2548,7 @@ True MiddleCenter White - 1691, 181 + 1667, 181 SpecialLabelBlue504 3, 43 @@ -2309,9 +2566,9 @@ True MiddleCenter White - 1649, 181 + 1626, 181 SpecialLabelBlue505 - 202, 3 + 269, 3 @@ -2327,7 +2584,7 @@ True MiddleCenter White - 1602, 19 + 1578, 19 SpecialLabelBlue506 3, 135 @@ -2525,7 +2782,7 @@ True MiddleCenter White - 1156, 60 + 1132, 60 SpecialLabelBlue508 3, 94 @@ -2543,7 +2800,7 @@ True MiddleCenter White - 1216, 60 + 1192, 60 SpecialLabelBlue507 3, 94 @@ -2552,7 +2809,7 @@ - 676, 64 + 652, 64 DV1PCP04 22, 12 @@ -2570,7 +2827,7 @@ True MiddleCenter White - 691, 53 + 667, 53 SpecialLabelBlue511 798, 3 @@ -2588,7 +2845,7 @@ True MiddleCenter White - 691, 54 + 667, 54 SpecialLabelBlue512 3, 16 @@ -2597,7 +2854,7 @@ - 586, 170 + 562, 170 DV1PCP16 13, 22 @@ -2615,193 +2872,16 @@ True MiddleCenter White - 588, 176 + 564, 176 SpecialLabelBlue513 106, 3 - - - - zsTurnOff - 1833, 105 - Fan17 - 10, 10 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1836, 110 - SpecialLabelBlue698 - 15, 2 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1849, 88 - SpecialLabelBlue697 - 2, 95 - - - - - zsTurnOff - 1809, 103 - Fan18 - 10, 10 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1828, 50 - SpecialLabelBlue696 - 15, 2 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1828, 50 - SpecialLabelBlue695 - 2, 62 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1801, 110 - SpecialLabelBlue694 - 29, 2 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1799, 42 - SpecialLabelBlue693 - 65, 2 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1798, 42 - SpecialLabelBlue692 - 2, 62 - - - - - - - False - - - - None - True - True - MiddleCenter - White - 1786, 56 - SpecialLabelBlue691 - 55, 2 - - - 1841, 50 - SheBei1 - 25, 40 - - - 1760, 53 - MoFenJi1 - 44, 72 - - - 142, 196, 216 - 20 - 1680, 82 - HslConveyer2147483646 - 84, 30 - - 1532, 15 + 1508, 15 DV1PCP18 22, 12 @@ -2810,7 +2890,7 @@ - 1319, 15 + 1295, 15 DV1PCP17 22, 12 @@ -2828,13 +2908,13 @@ True MiddleCenter Lime - 1715, 138 + 1691, 138 SpecialLabelBlue690 1, 87 ylNormal - 1683, 453 + 1659, 453 DM1OSF01 36, 10 @@ -2854,7 +2934,7 @@ True 0 White - 1670, 286 + 1646, 286 HR1OSI01 11, 12 @@ -2874,26 +2954,26 @@ True 0 White - 1670, 239 + 1646, 239 PR1OSI01 11, 12 - 1690, 399 + 1666, 399 LSiloO 10, 10 - 1690, 262 + 1666, 262 HSiloO 10, 10 - 1711, 224 + 1687, 224 AS1OSI01 14, 12 @@ -2906,7 +2986,7 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1670, 221 + 1646, 221 Bottle15 46, 237 @@ -2924,7 +3004,7 @@ True MiddleCenter Lime - 816, 138 + 792, 138 SpecialLabelBlue689 1, 16 @@ -2942,7 +3022,7 @@ True MiddleCenter Lime - 875, 138 + 851, 138 SpecialLabelBlue688 1, 16 @@ -2960,7 +3040,7 @@ True MiddleCenter Lime - 934, 138 + 910, 138 SpecialLabelBlue687 1, 16 @@ -2978,7 +3058,7 @@ True MiddleCenter Lime - 1029, 138 + 1005, 138 SpecialLabelBlue686 1, 16 @@ -2996,7 +3076,7 @@ True MiddleCenter Lime - 1088, 138 + 1064, 138 SpecialLabelBlue685 1, 16 @@ -3014,7 +3094,7 @@ True MiddleCenter Lime - 1180, 138 + 1156, 138 SpecialLabelBlue684 1, 18 @@ -3032,7 +3112,7 @@ True MiddleCenter Lime - 1239, 138 + 1215, 138 SpecialLabelBlue683 1, 18 @@ -3050,7 +3130,7 @@ True MiddleCenter Lime - 1298, 137 + 1274, 137 SpecialLabelBlue682 1, 19 @@ -3068,7 +3148,7 @@ True MiddleCenter Lime - 1357, 138 + 1333, 138 SpecialLabelBlue681 1, 18 @@ -3086,7 +3166,7 @@ True MiddleCenter Lime - 1450, 138 + 1426, 138 SpecialLabelBlue680 1, 18 @@ -3104,7 +3184,7 @@ True MiddleCenter Lime - 1509, 138 + 1485, 138 SpecialLabelBlue679 1, 18 @@ -3122,7 +3202,7 @@ True MiddleCenter Lime - 1568, 138 + 1544, 138 SpecialLabelBlue678 1, 18 @@ -3140,7 +3220,7 @@ True MiddleCenter Lime - 1627, 138 + 1603, 138 SpecialLabelBlue677 1, 18 @@ -3158,7 +3238,7 @@ True MiddleCenter Lime - 758, 138 + 734, 138 SpecialLabelBlue676 1, 16 @@ -3176,7 +3256,7 @@ True MiddleCenter Lime - 700, 137 + 676, 137 SpecialLabelBlue675 1016, 1 @@ -3194,7 +3274,7 @@ True MiddleCenter White - 1426, 57 + 1402, 57 SpecialLabelBlue674 3, 97 @@ -3212,7 +3292,7 @@ True MiddleCenter White - 1486, 54 + 1462, 54 SpecialLabelBlue673 3, 100 @@ -3221,7 +3301,7 @@ - 1260, 16 + 1236, 16 DV1PCP05 22, 12 @@ -3239,7 +3319,7 @@ True MiddleCenter White - 1544, 19 + 1520, 19 SpecialLabelBlue669 3, 135 @@ -3257,7 +3337,7 @@ True MiddleCenter White - 1274, 22 + 1250, 22 SpecialLabelBlue667 3, 132 @@ -3275,31 +3355,31 @@ True MiddleCenter White - 1334, 22 + 1310, 22 SpecialLabelBlue666 3, 132 ylNormal - 1595, 459 + 1571, 459 DM1NSF01 43, 10 ylNormal - 1535, 457 + 1511, 457 DM1MSF01 43, 10 ylNormal - 1477, 457 + 1453, 457 DM1LSF01 43, 10 ylNormal - 1418, 457 + 1394, 457 DM1KSF01 43, 10 @@ -3319,7 +3399,7 @@ True 0 White - 1579, 216 + 1555, 216 HR1NSI01 11, 12 @@ -3339,62 +3419,62 @@ True 0 White - 1579, 169 + 1555, 169 PR1NSI01 11, 12 - 1421, 402 + 1397, 402 LSiloK 13, 13 - 1481, 402 + 1457, 402 LSiloL 13, 13 - 1541, 402 + 1517, 402 LSiloM 13, 13 - 1599, 401 + 1575, 401 LSiloN 13, 13 - 1599, 193 + 1575, 193 HSiloN 13, 13 - 1541, 193 + 1517, 193 HSiloM 13, 13 - 1481, 193 + 1457, 193 HSiloL 13, 13 - 1421, 192 + 1397, 192 HSiloK 13, 13 - 1623, 155 + 1599, 155 AS1NSI01 14, 12 @@ -3407,14 +3487,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1579, 152 + 1555, 152 Bottle14 53, 308 - 1564, 155 + 1540, 155 AS1MSI01 14, 12 @@ -3434,7 +3514,7 @@ True 0 White - 1520, 216 + 1496, 216 HR1MSI01 11, 12 @@ -3454,7 +3534,7 @@ True 0 White - 1520, 169 + 1496, 169 PR1MSI01 11, 12 @@ -3467,14 +3547,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1520, 152 + 1496, 152 Bottle13 53, 308 - 1505, 155 + 1481, 155 AS1LSI01 14, 12 @@ -3494,7 +3574,7 @@ True 0 White - 1461, 216 + 1437, 216 HR1LSI01 11, 12 @@ -3514,7 +3594,7 @@ True 0 White - 1461, 169 + 1437, 169 PR1LSI01 11, 12 @@ -3527,14 +3607,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1461, 152 + 1437, 152 Bottle12 53, 308 - 1446, 155 + 1422, 155 AS1KSI01 14, 12 @@ -3554,7 +3634,7 @@ True 0 White - 1402, 216 + 1378, 216 HR1KSI01 11, 12 @@ -3574,7 +3654,7 @@ True 0 White - 1402, 172 + 1378, 172 PR1KSI01 11, 12 @@ -3587,7 +3667,7 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1402, 152 + 1378, 152 Bottle11 53, 308 @@ -3596,7 +3676,7 @@ - 992, 32 + 968, 32 DV1PCP15 22, 12 @@ -3614,7 +3694,7 @@ True MiddleCenter White - 1006, 42 + 982, 42 SpecialLabelBlue664 3, 111 @@ -3632,7 +3712,7 @@ True MiddleCenter White - 1064, 35 + 1040, 35 SpecialLabelBlue663 3, 117 @@ -3641,7 +3721,7 @@ - 704, 68 + 680, 68 DV1PCP11 22, 12 @@ -3650,7 +3730,7 @@ - 722, 86 + 698, 86 DV1PCP12 22, 12 @@ -3668,7 +3748,7 @@ True MiddleCenter White - 717, 89 + 693, 89 SpecialLabelBlue662 78, 3 @@ -3677,7 +3757,7 @@ - 837, 15 + 813, 15 DV1PCP03 22, 12 @@ -3695,7 +3775,7 @@ True MiddleCenter White - 735, 89 + 711, 89 SpecialLabelBlue661 3, 64 @@ -3713,7 +3793,7 @@ True MiddleCenter White - 792, 89 + 768, 89 SpecialLabelBlue660 3, 64 @@ -3731,7 +3811,7 @@ True MiddleCenter White - 851, 21 + 827, 21 SpecialLabelBlue659 3, 132 @@ -3749,7 +3829,7 @@ True MiddleCenter White - 910, 71 + 886, 71 SpecialLabelBlue658 3, 81 @@ -3767,7 +3847,7 @@ True MiddleCenter White - 629, 71 + 605, 71 SpecialLabelBlue657 284, 3 @@ -3785,7 +3865,7 @@ True MiddleCenter White - 669, 35 + 645, 35 SpecialLabelBlue654 397, 3 @@ -3803,21 +3883,21 @@ True MiddleCenter White - 587, 18 + 563, 18 SpecialLabelBlue652 1018, 3 - 641, 571 + 617, 571 AS1PCP02 14, 12 - 600, 286 + 576, 286 AS1PCP01 14, 12 @@ -3875,7 +3955,7 @@ True MiddleCenter White - 649, 382 + 625, 382 CrossTubeC2 3, 59 @@ -3893,7 +3973,7 @@ True MiddleCenter White - 652, 438 + 628, 438 CrossTubeC3 10, 3 @@ -3911,7 +3991,7 @@ True MiddleCenter White - 639, 382 + 615, 382 CrossTubeC1 13, 3 @@ -3929,7 +4009,7 @@ True MiddleCenter White - 639, 410 + 615, 410 CrossTubeD 22, 3 @@ -3938,7 +4018,7 @@ - 660, 395 + 636, 395 DV1PCP14 13, 22 @@ -3947,7 +4027,7 @@ - 660, 432 + 636, 432 DV1PCP13 13, 22 @@ -3956,7 +4036,7 @@ - 626, 367 + 602, 367 DV1PCP08 13, 22 @@ -3965,7 +4045,7 @@ - 626, 404 + 602, 404 DV1PCP07 13, 22 @@ -3983,7 +4063,7 @@ True MiddleCenter White - 669, 35 + 645, 35 SpecialLabelBlue643 3, 811 @@ -4001,7 +4081,7 @@ True MiddleCenter White - 608, 223 + 584, 223 CrossTubeA2 3, 58 @@ -4019,7 +4099,7 @@ True MiddleCenter White - 611, 278 + 587, 278 CrossTubeA3 10, 3 @@ -4037,7 +4117,7 @@ True MiddleCenter White - 598, 223 + 574, 223 CrossTubeA1 13, 3 @@ -4055,7 +4135,7 @@ True MiddleCenter White - 598, 251 + 574, 251 CrossTubeB 22, 3 @@ -4073,7 +4153,7 @@ True MiddleCenter White - 628, 71 + 604, 71 SpecialLabelBlue630 3, 497 @@ -4091,36 +4171,10 @@ True MiddleCenter White - 587, 21 + 563, 21 SpecialLabelBlue628 3, 262 - - - - zsTurnOff - 1881, 11 - Fan19 - 10, 10 - - - - - - - False - - - - None - True - True - MiddleCenter - Aqua - 1875, 58 - SpecialLabelBlue627 - 1, 16 - @@ -4173,7 +4227,7 @@ Aqua 127, 583 SpecialLabelBlue623 - 520, 1 + 496, 1 @@ -4245,7 +4299,7 @@ White 225, 846 SpecialLabelBlue602 - 447, 3 + 423, 3 @@ -4749,7 +4803,7 @@ Aqua 127, 298 SpecialLabelBlue595 - 478, 1 + 454, 1 @@ -4803,7 +4857,7 @@ White 225, 565 SpecialLabelBlue550 - 403, 3 + 379, 3 @@ -5325,7 +5379,7 @@ White 225, 281 SpecialLabelBlue543 - 365, 3 + 341, 3 @@ -5594,61 +5648,61 @@ ylNormal - 782, 455 + 758, 455 DM1BSF01 43, 10 ylNormal - 1325, 459 + 1301, 459 DM1JSF01 43, 10 ylNormal - 1265, 457 + 1241, 457 DM1ISF01 43, 10 ylNormal - 1207, 457 + 1183, 457 DM1HSF01 43, 10 ylNormal - 1148, 457 + 1124, 457 DM1GSF01 43, 10 ylNormal - 1056, 457 + 1032, 457 DM1FSF01 43, 10 ylNormal - 997, 456 + 973, 456 DM1ESF01 43, 10 ylNormal - 898, 456 + 874, 456 DM1DSF01 43, 10 ylNormal - 841, 455 + 817, 455 DM1CSF01 43, 10 ylNormal - 723, 456 + 699, 456 DM1ASF01 43, 10 @@ -5668,7 +5722,7 @@ True 0 White - 1309, 215 + 1285, 215 HR1JSI01 11, 12 @@ -5688,67 +5742,67 @@ True 0 White - 1309, 169 + 1285, 169 PR1JSI01 11, 12 - 1155, 401 + 1131, 401 LSiloG 13, 13 - 1209, 401 + 1185, 401 LSiloH 13, 13 - 1269, 401 + 1245, 401 LSiloI 13, 13 - 1328, 401 + 1304, 401 LSiloJ 13, 13 - 1328, 192 + 1304, 192 HSiloJ 13, 13 - 1269, 192 + 1245, 192 HSiloI 13, 13 - 1211, 192 + 1187, 192 HSiloH 13, 13 - 1154, 191 + 1130, 191 HSiloG 13, 13 - 1059, 401 + 1035, 401 LSiloF 13, 13 - 1059, 192 + 1035, 192 HSiloF 13, 13 @@ -5768,43 +5822,43 @@ True 0 White - 1040, 216 + 1016, 216 HR1FSI01 11, 12 - 906, 401 + 882, 401 LSiloD 13, 13 - 1001, 401 + 977, 401 LSiloE 13, 13 - 1001, 192 + 977, 192 HSiloE 13, 13 - 906, 192 + 882, 192 HSiloD 13, 13 - 846, 401 + 822, 401 LSiloC 13, 13 - 846, 192 + 822, 192 HSiloC 13, 13 @@ -5824,7 +5878,7 @@ True 0 White - 768, 216 + 744, 216 HR1BSI01 11, 12 @@ -5844,31 +5898,31 @@ True 0 White - 709, 215 + 685, 215 HR1ASI01 11, 12 - 789, 401 + 765, 401 LSiloB 13, 13 - 789, 192 + 765, 192 HSiloB 13, 13 - 727, 192 + 703, 192 HSiloA 13, 13 - 727, 401 + 703, 401 LSiloA 13, 13 @@ -5887,7 +5941,7 @@ - 1353, 155 + 1329, 155 AS1JSI01 14, 12 @@ -5900,14 +5954,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1309, 152 + 1285, 152 Bottle10 53, 308 - 1294, 155 + 1270, 155 AS1ISI01 14, 12 @@ -5927,7 +5981,7 @@ True 0 White - 1250, 215 + 1226, 215 HR1ISI01 11, 12 @@ -5947,7 +6001,7 @@ True 0 White - 1250, 169 + 1226, 169 PR1ISI01 11, 12 @@ -5960,14 +6014,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1250, 152 + 1226, 152 Bottle9 53, 308 - 1235, 155 + 1211, 155 AS1HSI01 14, 12 @@ -5987,7 +6041,7 @@ True 0 White - 1191, 215 + 1167, 215 HR1HSI01 11, 12 @@ -6007,7 +6061,7 @@ True 0 White - 1191, 169 + 1167, 169 PR1HSI01 11, 12 @@ -6020,14 +6074,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1191, 152 + 1167, 152 Bottle8 53, 308 - 1176, 155 + 1152, 155 AS1GSI01 14, 12 @@ -6047,7 +6101,7 @@ True 0 White - 1131, 215 + 1107, 215 HR1GSI01 11, 12 @@ -6067,7 +6121,7 @@ True 0 White - 1132, 169 + 1108, 169 PR1GSI01 11, 12 @@ -6080,14 +6134,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1132, 152 + 1108, 152 Bottle7 53, 308 - 1084, 153 + 1060, 153 AS1FSI01 14, 12 @@ -6107,7 +6161,7 @@ True 0 White - 1040, 167 + 1016, 167 PR1FSI01 11, 12 @@ -6120,14 +6174,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 1040, 150 + 1016, 150 Bottle6 53, 308 - 1025, 153 + 1001, 153 AS1ESI01 14, 12 @@ -6147,7 +6201,7 @@ True 0 White - 981, 216 + 957, 216 HR1ESI01 11, 12 @@ -6167,7 +6221,7 @@ True 0 White - 981, 167 + 957, 167 PR1ESI01 11, 12 @@ -6180,14 +6234,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 981, 150 + 957, 150 Bottle5 53, 308 - 930, 153 + 906, 153 AS1DSI01 14, 12 @@ -6207,7 +6261,7 @@ True 0 White - 886, 216 + 862, 216 HR1DSI01 11, 12 @@ -6227,7 +6281,7 @@ True 0 White - 886, 168 + 862, 168 PR1DSI01 11, 12 @@ -6240,14 +6294,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 886, 150 + 862, 150 Bottle4 53, 308 - 871, 153 + 847, 153 AS1CSI01 14, 12 @@ -6267,7 +6321,7 @@ True 0 White - 827, 216 + 803, 216 HR1CSI01 11, 12 @@ -6287,7 +6341,7 @@ True 0 White - 827, 168 + 803, 168 PR1CSI01 11, 12 @@ -6300,14 +6354,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 827, 150 + 803, 150 Bottle3 53, 308 - 812, 154 + 788, 154 AS1BSI01 14, 12 @@ -6327,7 +6381,7 @@ True 0 White - 768, 168 + 744, 168 PR1BSI01 11, 12 @@ -6340,14 +6394,14 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 768, 150 + 744, 150 Bottle2 53, 308 - 754, 153 + 730, 153 AS1ASI01 14, 12 @@ -6367,7 +6421,7 @@ True 0 White - 709, 168 + 685, 168 PR1ASI01 11, 12 @@ -6380,15 +6434,10 @@ 142, 196, 216 240, 240, 240 151, 232, 244 - 709, 150 + 685, 150 Bottle1 53, 308 - - 1860, 19 - Dou27 - 30, 40 - 241, 285 Xie17