diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs index 54ae6d4..ec14c23 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs @@ -30,6 +30,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver internal static void SetTubeColor(SpecialLabelBlue tube, bool valve1, bool valve2) { + if (null == tube) { + return; + } if (valve1 && valve2) { tube.BackColor = Color.LightGreen; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index 08dd30f..e1fb1ec 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -37,6 +37,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver { #region 属性 + XianManager xian; + PlcTempEntity PlcTemp = new PlcTempEntity(); private Timer timer; @@ -101,7 +103,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver base.RunIni(runtime); //必须调用 Controls = GetAllControls(); - + xian = new XianManager(Controls); 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; @@ -288,21 +290,21 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver if (a.End==true && a.Start==true) { - if (no == 1) - { - Db2101HelperWriter.WriterLinAStart(false); - Db2101HelperWriter.WriterLinAEnd(false); - } - if (no == 2) - { - Db2101HelperWriter.WriterLinBStart(false); - Db2101HelperWriter.WriterLinBEnd(false); - } - if (no == 3) - { - Db2101HelperWriter.WriterLinCStart(false); - Db2101HelperWriter.WriterLinCEnd(false); - } + //if (no == 1) + //{ + // Db2101HelperWriter.WriterLinAStart(false); + // Db2101HelperWriter.WriterLinAEnd(false); + //} + //if (no == 2) + //{ + // Db2101HelperWriter.WriterLinBStart(false); + // Db2101HelperWriter.WriterLinBEnd(false); + //} + //if (no == 3) + //{ + // Db2101HelperWriter.WriterLinCStart(false); + // Db2101HelperWriter.WriterLinCEnd(false); + //} SuSong su =FreeDb.FreeSqlUnit.Instance. Queryable(). diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs index a448c52..bdcd30c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/InitAction.cs @@ -48,6 +48,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting SetSpeed(); } + + private void SetValueFromPlc() { BoxE.ASetValue1.MCValue = DB122.PressureA.SetValue1; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 7308664..2e60280 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -773,6 +773,7 @@ + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/XianManager.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/XianManager.cs new file mode 100644 index 0000000..9186b59 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/XianManager.cs @@ -0,0 +1,137 @@ +using DataBlockHelper.DBHelpers; + +using Mesnac.Controls.Default; + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing +{ + public class XianManager + { + List Controls; + + + public XianManager(List c) + { + this.Controls = c; + + PropertyInfo[] sourcePropertyInfoList = this.GetType().GetProperties(); + foreach (PropertyInfo sourceProperty in sourcePropertyInfoList) + { + string name = sourceProperty.Name; + var pro = Controls.FirstOrDefault(x => x.Name == name) as SpecialLabelBlue; + sourceProperty.SetValue(this, pro); + } + + } + + public SpecialLabelBlue SpA1 { get; set; } + public SpecialLabelBlue SpAL { get; set; } + public SpecialLabelBlue SpAR { get; set; } + public SpecialLabelBlue SpA1V { get; set; } + public SpecialLabelBlue SpA1VC01 { get; set; } + public SpecialLabelBlue SpA1VC02 { get; set; } + public SpecialLabelBlue SpA1VC16 { get; set; } + public SpecialLabelBlue SpA1HC16 { get; set; } + public SpecialLabelBlue SpA1HC03 { get; set; } + public SpecialLabelBlue SpA1HC05 { get; set; } + public SpecialLabelBlue SpA1HC17 { get; set; } + public SpecialLabelBlue SpA1HC18 { get; set; } + public SpecialLabelBlue SpA1VC1802 { get; set; } + public SpecialLabelBlue SpA1VC1801 { get; set; } + public SpecialLabelBlue SpA1VC202 { get; set; } + public SpecialLabelBlue SpA1VC201 { get; set; } + public SpecialLabelBlue SpA1VC17 { get; set; } + public SpecialLabelBlue SpA1VC05 { get; set; } + public SpecialLabelBlue SpA1VC19 { get; set; } + public SpecialLabelBlue SpA1VC06 { get; set; } + public SpecialLabelBlue SpA1VC1502 { get; set; } + public SpecialLabelBlue SpA1VC15H { get; set; } + public SpecialLabelBlue SpA1VC1501 { get; set; } + public SpecialLabelBlue SpA1VC113 { get; set; } + public SpecialLabelBlue SpA1VC11 { get; set; } + public SpecialLabelBlue SpA1VC04 { get; set; } + public SpecialLabelBlue SpA1VC10 { get; set; } + public SpecialLabelBlue SpA1HC11 { get; set; } + public SpecialLabelBlue SpA1HC12 { get; set; } + public SpecialLabelBlue SpA1VC121 { get; set; } + public SpecialLabelBlue SpA1VC03 { get; set; } + public SpecialLabelBlue SpA1VC122 { get; set; } + public SpecialLabelBlue SpC1HC14 { get; set; } + public SpecialLabelBlue SpC1HC13 { get; set; } + public SpecialLabelBlue SpC1V01 { get; set; } + public SpecialLabelBlue SpC1 { get; set; } + public SpecialLabelBlue SpB1 { get; set; } + public SpecialLabelBlue SL1 { get; set; } + public SpecialLabelBlue SL2 { get; set; } + public SpecialLabelBlue SL3 { get; set; } + public SpecialLabelBlue SL4 { get; set; } + public SpecialLabelBlue SL5 { get; set; } + public SpecialLabelBlue SL6 { get; set; } + public SpecialLabelBlue SL9 { get; set; } + public SpecialLabelBlue SL11 { get; set; } + public SpecialLabelBlue Sp15 { get; set; } + public SpecialLabelBlue Sp16 { get; set; } + public SpecialLabelBlue SL8 { get; set; } + public SpecialLabelBlue SL7 { get; set; } + public SpecialLabelBlue CrossTubeC3 { get; set; } + public SpecialLabelBlue CrossTubeC2 { get; set; } + public SpecialLabelBlue CrossTubeC1 { get; set; } + public SpecialLabelBlue CrossTubeD { get; set; } + public SpecialLabelBlue SpA1HC02 { get; set; } + public SpecialLabelBlue SpA1HC02V { get; set; } + public SpecialLabelBlue SpA1HC02VC09 { get; set; } + public SpecialLabelBlue CrossTubeB { get; set; } + + + public void Action() + { + DB112Helper DB122 = new DB112Helper(); + var xx = DB122.GetXX(); + if (xx.A) + { + + } + else + { + + } + + if (xx.B) + { + + } + else + { + + } + + if (xx.C) + { + + } + else + { + + } + } + + + public void SetWhite(SpecialLabelBlue special) + { + special.BackColor = Color.White; + } + + public void SetLightGreen(SpecialLabelBlue special) + { + special.BackColor = Color.White; + } + } +} diff --git a/DataBlockHelper/DBHelpers/DB112Helper.cs b/DataBlockHelper/DBHelpers/DB112Helper.cs index 7c97070..b492529 100644 --- a/DataBlockHelper/DBHelpers/DB112Helper.cs +++ b/DataBlockHelper/DBHelpers/DB112Helper.cs @@ -16,7 +16,20 @@ namespace DataBlockHelper.DBHelpers OperateResult db112 = PlcConnect.Instance.Read("DB112.0.0", 151); bytes = db112.Content; } + /// + /// 这个就是那个产线在运行 + /// + /// + public XX GetXX() + { + XX x=new XX(); + var content = bytes.Skip(0).Take(1).ToArray().First(); + x.A=content.GetBit(0); + x.B=content.GetBit(1); + x.C=content.GetBit(2); + return x; + } public Conveyor PressureA => new Conveyor(2, bytes); @@ -32,6 +45,14 @@ namespace DataBlockHelper.DBHelpers } + public class XX + { + public bool A { get; set; } + public bool B { get; set; } + + public bool C { get; set; } + + } public class Conveyor { diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index cb66d80..f8aed08 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1,6 +1,348 @@ + + + + + + False + + + + None + True + True + MiddleCenter + White + 700, 71 + SpA1VC11 + 190, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 675, 71 + SpA1VC04 + 5, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1408, 54 + SpA1HC20 + 55, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1196, 54 + SpA1HC19 + 200, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1143, 54 + SpA1HC06 + 40, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 986, 36 + SpA1VC15H + 55, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1519, 19 + SpA1HC18 + 60, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1319, 19 + SpA1HC17 + 200, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1259, 19 + SpA1HC05 + 40, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 834, 19 + SpA1HC03 + 405, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 645, 409 + SpC1HC13 + 1, 25 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 645, 452 + SpC1V01 + 1, 395 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 603, 255 + SpA1HC09 + 1, 20 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 605, 295 + SpA1HC08 + 1, 70 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 605, 382 + SpA1HC07 + 1, 30 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 605, 417 + SpB1V01 + 1, 150 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 567, 181 + SpA1VC02 + 1, 32 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 565, 256 + SpA1V + 1, 26 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 567, 227 + SpA1VC01 + 1, 20 + @@ -475,7 +817,7 @@ None True True - C21 + C16 Window 572, 158 MCLabel4 @@ -681,26 +1023,6 @@ MCLabel14 23, 12 - - - - Red - DarkGray - - - False - - - - None - True - True - C01 - Window - 552, 268 - MCLabel15 - 23, 12 - @@ -717,7 +1039,7 @@ White 222, 413 SpecialLabelBlue448 - 31, 2 + 31, 1 @@ -735,7 +1057,7 @@ White 262, 693 SpecialLabelBlue449 - 29, 2 + 29, 1 @@ -751,9 +1073,9 @@ True MiddleCenter White - 263, 126 + 262, 126 SpecialLabelBlue450 - 28, 2 + 28, 1 @@ -771,7 +1093,7 @@ White 261, 413 SpecialLabelBlue452 - 29, 2 + 29, 1 @@ -789,7 +1111,7 @@ White 278, 663 SpecialLabelBlue454 - 13, 2 + 13, 1 @@ -807,7 +1129,7 @@ White 289, 664 SpecialLabelBlue453 - 2, 41 + 1, 41 @@ -825,7 +1147,7 @@ White 278, 384 SpecialLabelBlue455 - 12, 2 + 12, 1 @@ -843,7 +1165,7 @@ White 289, 384 SpecialLabelBlue456 - 2, 41 + 1, 41 @@ -861,7 +1183,7 @@ White 278, 100 SpecialLabelBlue457 - 13, 2 + 13, 1 @@ -877,9 +1199,9 @@ True MiddleCenter White - 289, 102 + 290, 102 SpecialLabelBlue458 - 2, 28 + 1, 28 @@ -967,7 +1289,7 @@ DM1GDS03 19, 19 - + @@ -981,9 +1303,9 @@ True MiddleCenter White - 1878, 186 - SpecialLabelBlue464 - 3, 118 + 1882, 184 + SL4 + 1, 118 Silver @@ -1025,7 +1347,7 @@ DM1GDS06 19, 19 - + @@ -1040,10 +1362,10 @@ MiddleCenter White 1836, 263 - SpecialLabelBlue465 - 3, 39 + SL6 + 1, 39 - + @@ -1058,10 +1380,10 @@ MiddleCenter White 1856, 42 - SpecialLabelBlue468 - 3, 22 + SL1 + 1, 22 - + @@ -1076,10 +1398,10 @@ MiddleCenter White 1856, 41 - SpecialLabelBlue467 - 25, 3 + SL2 + 25, 1 - + @@ -1093,11 +1415,11 @@ True MiddleCenter White - 1878, 43 - SpecialLabelBlue469 - 3, 136 + 1881, 43 + SL3 + 1, 136 - + @@ -1112,10 +1434,10 @@ MiddleCenter White 1830, 301 - SpecialLabelBlue470 - 51, 3 + SL5 + 51, 1 - + @@ -1130,10 +1452,10 @@ MiddleCenter White 1804, 81 - SpecialLabelBlue471 - 3, 98 + SL7 + 1, 98 - + @@ -1148,10 +1470,10 @@ MiddleCenter White 1805, 81 - SpecialLabelBlue473 - 30, 3 + Sp16 + 30, 1 - + @@ -1166,8 +1488,8 @@ MiddleCenter White 1804, 186 - SpecialLabelBlue472 - 3, 64 + SL8 + 1, 64 @@ -1177,7 +1499,7 @@ DM1GDS12 19, 19 - + @@ -1191,9 +1513,9 @@ True MiddleCenter White - 1856, 142 - SpecialLabelBlue474 - 3, 41 + 1858, 141 + Sp15 + 1, 41 1830, 213 @@ -1288,7 +1610,7 @@ 537, 1 - 648, 483 + 648, 479 PressureCurve 1249, 382 @@ -2752,9 +3074,29 @@ MCLabel275 23, 12 + + + + Red + DarkGray + + + False + + + + None + True + True + C01 + Window + 165, 112 + MCLabel15 + 23, 12 + 355, 139 MCPanelBlack1 - 203, 135 + 191, 135 @@ -3810,7 +4152,7 @@ HighLevel1 13, 13 - + @@ -3825,8 +4167,8 @@ MiddleCenter White 693, 77 - SpecialLabelBlue503 - 3, 13 + SpA1HC11 + 1, 13 @@ -3864,7 +4206,7 @@ DV1PCP01 13, 22 - + @@ -3879,10 +4221,10 @@ MiddleCenter White 1667, 181 - SpecialLabelBlue504 - 3, 43 + SL11 + 1, 43 - + @@ -3897,10 +4239,10 @@ MiddleCenter White 1626, 181 - SpecialLabelBlue505 - 269, 3 + SL9 + 269, 1 - + @@ -3914,9 +4256,9 @@ True MiddleCenter White - 1578, 19 - SpecialLabelBlue506 - 3, 135 + 1580, 19 + SpA1VC1802 + 1, 135 @@ -4098,7 +4440,7 @@ SPV1DBT01 11, 12 - + @@ -4113,10 +4455,10 @@ MiddleCenter White 1132, 60 - SpecialLabelBlue508 - 3, 94 + SpA1VC06 + 1, 94 - + @@ -4131,8 +4473,8 @@ MiddleCenter White 1192, 60 - SpecialLabelBlue507 - 3, 94 + SpA1VC19 + 1, 94 @@ -4143,7 +4485,7 @@ DV1PCP04 22, 12 - + @@ -4158,10 +4500,10 @@ MiddleCenter White 667, 53 - SpecialLabelBlue511 - 798, 3 + SpA1HC04 + 450, 1 - + @@ -4176,8 +4518,8 @@ MiddleCenter White 667, 54 - SpecialLabelBlue512 - 3, 16 + SpC04H + 1, 16 @@ -4188,7 +4530,7 @@ DV1PCP16 13, 22 - + @@ -4203,8 +4545,8 @@ MiddleCenter White 564, 176 - SpecialLabelBlue513 - 106, 3 + SpA1HC1701 + 106, 1 @@ -4590,7 +4932,7 @@ SpecialLabelBlue675 1016, 1 - + @@ -4604,11 +4946,11 @@ True MiddleCenter White - 1402, 57 - SpecialLabelBlue674 - 3, 97 + 1402, 63 + SpA1VC201 + 1, 97 - + @@ -4623,8 +4965,8 @@ MiddleCenter White 1462, 54 - SpecialLabelBlue673 - 3, 100 + SpA1VC202 + 1, 100 @@ -4635,7 +4977,7 @@ DV1PCP05 22, 12 - + @@ -4650,10 +4992,10 @@ MiddleCenter White 1520, 19 - SpecialLabelBlue669 - 3, 135 + SpA1VC1801 + 1, 135 - + @@ -4668,10 +5010,10 @@ MiddleCenter White 1250, 22 - SpecialLabelBlue667 - 3, 132 + SpA1VC05 + 1, 132 - + @@ -4686,8 +5028,8 @@ MiddleCenter White 1310, 22 - SpecialLabelBlue666 - 3, 132 + SpA1VC17 + 1, 132 ylNormal @@ -5010,7 +5352,7 @@ DV1PCP15 22, 12 - + @@ -5025,10 +5367,10 @@ MiddleCenter White 982, 42 - SpecialLabelBlue664 - 3, 111 + SpA1VC1501 + 1, 111 - + @@ -5042,9 +5384,9 @@ True MiddleCenter White - 1040, 35 - SpecialLabelBlue663 - 3, 117 + 1041, 35 + SpA1VC1502 + 1, 117 @@ -5064,7 +5406,7 @@ DV1PCP12 22, 12 - + @@ -5079,8 +5421,8 @@ MiddleCenter White 693, 89 - SpecialLabelBlue662 - 78, 3 + SpA1HC12 + 78, 1 @@ -5091,7 +5433,7 @@ DV1PCP03 22, 12 - + @@ -5106,10 +5448,10 @@ MiddleCenter White 711, 89 - SpecialLabelBlue661 - 3, 64 + SpA1VC121 + 1, 64 - + @@ -5123,11 +5465,11 @@ True MiddleCenter White - 768, 89 - SpecialLabelBlue660 - 3, 64 + 770, 90 + SpA1VC122 + 1, 64 - + @@ -5142,10 +5484,10 @@ MiddleCenter White 827, 21 - SpecialLabelBlue659 - 3, 132 + SpA1VC03 + 1, 132 - + @@ -5159,11 +5501,11 @@ True MiddleCenter White - 886, 71 - SpecialLabelBlue658 - 3, 81 + 889, 72 + SpA1VC113 + 1, 81 - + @@ -5178,8 +5520,8 @@ MiddleCenter White 605, 71 - SpecialLabelBlue657 - 284, 3 + SpA1VC10 + 64, 1 @@ -5197,9 +5539,9 @@ White 645, 35 SpecialLabelBlue654 - 397, 3 + 325, 1 - + @@ -5213,9 +5555,9 @@ True MiddleCenter White - 563, 18 - SpecialLabelBlue652 - 1018, 3 + 571, 18 + SpA1HC16 + 260, 1 @@ -5285,9 +5627,9 @@ True MiddleCenter White - 625, 382 + 627, 381 CrossTubeC2 - 3, 59 + 1, 59 @@ -5305,7 +5647,7 @@ White 628, 438 CrossTubeC3 - 10, 3 + 10, 1 @@ -5323,7 +5665,7 @@ White 615, 382 CrossTubeC1 - 13, 3 + 13, 1 @@ -5339,9 +5681,9 @@ True MiddleCenter White - 615, 410 + 617, 412 CrossTubeD - 22, 3 + 22, 1 @@ -5379,7 +5721,7 @@ DV1PCP07 13, 22 - + @@ -5394,10 +5736,10 @@ MiddleCenter White 645, 35 - SpecialLabelBlue643 - 3, 811 + SpC1HC14 + 1, 360 - + @@ -5411,11 +5753,11 @@ True MiddleCenter White - 584, 223 - CrossTubeA2 - 3, 58 + 586, 222 + SpA1HC02V + 1, 58 - + @@ -5430,10 +5772,10 @@ MiddleCenter White 587, 278 - CrossTubeA3 - 10, 3 + SpA1HC02VC09 + 10, 1 - + @@ -5448,8 +5790,8 @@ MiddleCenter White 574, 223 - CrossTubeA1 - 13, 3 + SpA1HC02 + 13, 1 @@ -5467,9 +5809,9 @@ White 574, 251 CrossTubeB - 22, 3 + 22, 1 - + @@ -5484,10 +5826,10 @@ MiddleCenter White 604, 71 - SpecialLabelBlue630 - 3, 497 + SpA1HC10 + 1, 170 - + @@ -5501,9 +5843,9 @@ True MiddleCenter White - 563, 21 - SpecialLabelBlue628 - 3, 262 + 569, 18 + SpA1VC16 + 1, 160 @@ -5613,7 +5955,7 @@ SpecialLabelBlue601 134, 1 - + @@ -5627,9 +5969,9 @@ True MiddleCenter White - 225, 846 - SpecialLabelBlue602 - 423, 3 + 223, 846 + SpC1 + 423, 1 @@ -5661,7 +6003,7 @@ White 286, 818 SpecialLabelBlue603 - 3, 29 + 1, 29 @@ -5679,7 +6021,7 @@ White 225, 819 SpecialLabelBlue604 - 3, 27 + 1, 27 @@ -5786,7 +6128,7 @@ White 289, 696 SpecialLabelBlue608 - 2, 41 + 1, 41 @@ -5804,7 +6146,7 @@ White 222, 695 SpecialLabelBlue609 - 2, 42 + 1, 42 @@ -5822,7 +6164,7 @@ White 222, 693 SpecialLabelBlue610 - 30, 2 + 30, 1 @@ -5840,7 +6182,7 @@ White 241, 706 SpecialLabelBlue611 - 30, 3 + 30, 1 @@ -5856,9 +6198,9 @@ True MiddleCenter White - 268, 706 + 270, 706 SpecialLabelBlue612 - 3, 35 + 1, 35 @@ -5876,7 +6218,7 @@ White 241, 706 SpecialLabelBlue613 - 3, 35 + 1, 35 @@ -5892,9 +6234,9 @@ True MiddleCenter White - 255, 700 + 257, 697 SpecialLabelBlue614 - 3, 9 + 1, 9 @@ -5964,7 +6306,7 @@ White 255, 631 SpecialLabelBlue615 - 3, 24 + 1, 24 235, 653 @@ -6171,7 +6513,7 @@ SpecialLabelBlue549 133, 1 - + @@ -6185,9 +6527,9 @@ True MiddleCenter White - 225, 565 - SpecialLabelBlue550 - 379, 3 + 225, 567 + SpB1 + 379, 1 @@ -6219,7 +6561,7 @@ White 286, 537 SpecialLabelBlue551 - 3, 29 + 1, 29 @@ -6237,7 +6579,7 @@ White 225, 538 SpecialLabelBlue552 - 3, 27 + 1, 27 @@ -6344,7 +6686,7 @@ White 289, 414 SpecialLabelBlue556 - 2, 41 + 1, 41 @@ -6362,7 +6704,7 @@ White 222, 414 SpecialLabelBlue557 - 2, 41 + 1, 41 @@ -6380,7 +6722,7 @@ White 241, 424 SpecialLabelBlue558 - 30, 3 + 30, 1 @@ -6396,9 +6738,9 @@ True MiddleCenter White - 268, 426 + 270, 426 SpecialLabelBlue560 - 3, 33 + 1, 33 @@ -6416,7 +6758,7 @@ White 241, 426 SpecialLabelBlue561 - 3, 33 + 1, 33 @@ -6434,7 +6776,7 @@ White 255, 419 SpecialLabelBlue562 - 3, 5 + 1, 5 @@ -6504,7 +6846,7 @@ White 255, 348 SpecialLabelBlue563 - 3, 24 + 1, 24 235, 372 @@ -6675,7 +7017,7 @@ SpecialLabelBlue544 133, 1 - + @@ -6689,9 +7031,9 @@ True MiddleCenter White - 225, 281 - SpecialLabelBlue543 - 341, 3 + 224, 282 + SpA1 + 341, 1 @@ -6707,7 +7049,7 @@ BU1DBT06 14, 12 - + @@ -6722,10 +7064,10 @@ MiddleCenter White 286, 253 - SpecialLabelBlue541 - 3, 29 + SpAR + 1, 29 - + @@ -6740,8 +7082,8 @@ MiddleCenter White 225, 254 - SpecialLabelBlue542 - 3, 27 + SpAL + 1, 27 @@ -6846,9 +7188,9 @@ True MiddleCenter White - 289, 129 + 290, 129 SpecialLabelBlue536 - 2, 42 + 1, 42 @@ -6866,7 +7208,7 @@ White 223, 128 SpecialLabelBlue537 - 2, 43 + 1, 43 @@ -6884,7 +7226,7 @@ White 223, 126 SpecialLabelBlue535 - 28, 2 + 28, 1 @@ -6900,9 +7242,9 @@ True MiddleCenter White - 241, 142 + 241, 143 SpecialLabelBlue534 - 30, 3 + 30, 1 @@ -6918,9 +7260,9 @@ True MiddleCenter White - 268, 145 + 270, 145 SpecialLabelBlue530 - 3, 30 + 1, 30 @@ -6936,9 +7278,9 @@ True MiddleCenter White - 241, 145 + 241, 144 SpecialLabelBlue529 - 3, 30 + 1, 30 @@ -6956,7 +7298,7 @@ White 255, 135 SpecialLabelBlue528 - 3, 10 + 1, 10 ylNormal