diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs index fc37deb..841e2a6 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/ControlsHelper.cs @@ -5,6 +5,7 @@ using Mesnac.Controls.ChemicalWeighing; using Mesnac.Controls.Default; using System; using System.Collections.Generic; +using System.Drawing; using System.Linq; using System.Reflection; using System.Text; @@ -26,5 +27,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver return value; } } + + public static void SetTubeColor(SpecialLabelBlue tube, bool valve1, bool valve2) + { + if(valve1 && valve2) + { + tube.BackColor = Color.LightGreen; + } + else + { + tube.BackColor = Color.White; + } + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index 295fcea..fbb1279 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -64,6 +64,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver MCLabelEntity LabelE = new MCLabelEntity(); ControlCabinetEntity CabinetE = new ControlCabinetEntity(); FanEntity FanE = new FanEntity(); + SpecialLabelBlueEntity TubeE = new SpecialLabelBlueEntity(); /// /// 报警滚动条 @@ -117,6 +118,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsHelper.ControlImport(LabelE, Controls); ControlsHelper.ControlImport(CabinetE, Controls); ControlsHelper.ControlImport(FanE, Controls); + ControlsHelper.ControlImport(TubeE, Controls); this.AlarmMoveText.Font = new Font("宋体", 15f, FontStyle.Regular, GraphicsUnit.Point, 134); this.AlarmMoveText.ForeColor = Color.White; @@ -643,19 +645,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver 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, 2); - ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP02, PlcTemp.DV1PCP02_AlarmR, PlcTemp.DV1PCP02_SetR, PlcTemp.DV1PCP02_AlarmL, PlcTemp.DV1PCP02_SetL, 2); + ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP02, PlcTemp.DV1PCP02_AlarmR, PlcTemp.DV1PCP02_SetR, PlcTemp.DV1PCP02_AlarmL, PlcTemp.DV1PCP02_SetL, 6); 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, 3); 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.DV1PCP08, PlcTemp.DV1PCP08_AlarmR, PlcTemp.DV1PCP08_SetR, PlcTemp.DV1PCP08_AlarmL, PlcTemp.DV1PCP08_SetL, 6); 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.DV1PCP10, PlcTemp.DV1PCP10_AlarmR, PlcTemp.DV1PCP10_SetR, PlcTemp.DV1PCP10_AlarmL, PlcTemp.DV1PCP10_SetL, 5); 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, 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.DV1PCP14, PlcTemp.DV1PCP14_AlarmR, PlcTemp.DV1PCP14_SetR, PlcTemp.DV1PCP14_AlarmL, PlcTemp.DV1PCP14_SetL, 5); ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP15, PlcTemp.DV1PCP15_AlarmR, PlcTemp.DV1PCP15_SetR, PlcTemp.DV1PCP15_AlarmL, PlcTemp.DV1PCP15_SetL, 0); ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP16, PlcTemp.DV1PCP16_AlarmR, PlcTemp.DV1PCP16_SetR, PlcTemp.DV1PCP16_AlarmL, PlcTemp.DV1PCP16_SetL, 2); ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP17, PlcTemp.DV1PCP17_AlarmR, PlcTemp.DV1PCP17_SetR, PlcTemp.DV1PCP17_AlarmL, PlcTemp.DV1PCP17_SetL, 0); @@ -663,6 +665,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver 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); + ControlsHelper.SetTubeColor(TubeE.CrossTubeA1, PlcTemp.DV1PCP02_SetR, PlcTemp.DV1PCP09_SetR); + ControlsHelper.SetTubeColor(TubeE.CrossTubeA2, PlcTemp.DV1PCP02_SetR, PlcTemp.DV1PCP09_SetR); + ControlsHelper.SetTubeColor(TubeE.CrossTubeA3, PlcTemp.DV1PCP02_SetR, PlcTemp.DV1PCP09_SetR); + ControlsHelper.SetTubeColor(TubeE.CrossTubeB, PlcTemp.DV1PCP01_SetR, PlcTemp.DV1PCP10_SetR); + ControlsHelper.SetTubeColor(TubeE.CrossTubeC1, PlcTemp.DV1PCP08_SetR, PlcTemp.DV1PCP13_SetR); + ControlsHelper.SetTubeColor(TubeE.CrossTubeC2, PlcTemp.DV1PCP08_SetR, PlcTemp.DV1PCP13_SetR); + ControlsHelper.SetTubeColor(TubeE.CrossTubeC3, PlcTemp.DV1PCP08_SetR, PlcTemp.DV1PCP13_SetR); + ControlsHelper.SetTubeColor(TubeE.CrossTubeD, PlcTemp.DV1PCP07_SetR, PlcTemp.DV1PCP14_SetR); } private void DB91SetData() diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs index ef38359..bd49894 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs @@ -286,4 +286,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public Fan DM1ESIG01 { get; set; } } + internal class SpecialLabelBlueEntity + { + public SpecialLabelBlue CrossTubeA1 { get; set; } + public SpecialLabelBlue CrossTubeA2 { get; set; } + public SpecialLabelBlue CrossTubeA3 { get; set; } + public SpecialLabelBlue CrossTubeB { get; set; } + public SpecialLabelBlue CrossTubeC1 { get; set; } + public SpecialLabelBlue CrossTubeC2 { get; set; } + public SpecialLabelBlue CrossTubeC3 { get; set; } + public SpecialLabelBlue CrossTubeD { get; set; } + } + } diff --git a/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs b/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs index f7cbfe3..b53cbc1 100644 --- a/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs +++ b/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.Designer.cs @@ -104,7 +104,7 @@ this.MinimumSize = new System.Drawing.Size(908, 39); this.Name = "FrmSysLogin"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "榄菊蚊香自动配料系统"; + this.Text = "榄菊蚊香配料输送系统"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmSysLogin_FormClosed); this.VisibleChanged += new System.EventHandler(this.FrmSysLogin_VisibleChanged); this.ResumeLayout(false); diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj index 60f66e0..0667935 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj +++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj @@ -734,6 +734,13 @@ + + + + + + + diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL0.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL0.png new file mode 100644 index 0000000..12718bd Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL0.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL1.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL1.png new file mode 100644 index 0000000..574804e Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL1.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL2.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL2.png new file mode 100644 index 0000000..fd0da58 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFL2.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLAll.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLAll.png new file mode 100644 index 0000000..5251219 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLAll.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLHError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLHError.png new file mode 100644 index 0000000..2f87187 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLHError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLHVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLHVError.png new file mode 100644 index 0000000..dab7eb0 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLHVError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLVError.png new file mode 100644 index 0000000..4506155 Binary files /dev/null and b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveFLVError.png differ diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs b/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs index e06437c..73da2dd 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs +++ b/Controls/Mesnac.Controls.ChemicalWeighing/ThreeWayValve.cs @@ -23,6 +23,7 @@ namespace Mesnac.Controls.ChemicalWeighing private string[] sImagesCL = new String[7]; private string[] sImagesCR = new String[7]; private string[] sImagesFR = new String[7]; + private string[] sImagesFL = new String[7]; private bool _zltValue; private bool _zldValue; private bool _almtValue; @@ -129,6 +130,21 @@ namespace Mesnac.Controls.ChemicalWeighing sImagesFR[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFRAll.png"; + sImagesFL[0] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFL0.png"; + //直通 + sImagesFL[1] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFL1.png"; + //斜通 + sImagesFL[2] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFL2.png"; + //直通报警通知 + sImagesFL[3] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFLHError.png"; + //斜通报警通知 + sImagesFL[4] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFLVError.png"; + //都报警 + sImagesFL[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFLHVError.png"; + //三个都通 + sImagesFL[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveFLAll.png"; + + } @@ -200,6 +216,9 @@ namespace Mesnac.Controls.ChemicalWeighing _imageStream = _assembly.GetManifestResourceStream(sImagesCR[defaultIndex]); break; case 5: + _imageStream = _assembly.GetManifestResourceStream(sImagesFL[defaultIndex]); + break; + case 6: _imageStream = _assembly.GetManifestResourceStream(sImagesFR[defaultIndex]); break; default: diff --git a/Main/MCBackView/Properties/MesnacResource.resx b/Main/MCBackView/Properties/MesnacResource.resx index fe3eeeb..f56fa90 100644 --- a/Main/MCBackView/Properties/MesnacResource.resx +++ b/Main/MCBackView/Properties/MesnacResource.resx @@ -188,7 +188,7 @@ ..\images\MenuAndTools\Icons_16X16_Wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 榄菊蚊香自动配料系统 V1.0 + 榄菊蚊香配料输送系统 V1.0 提示 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 4757359..da7c29b 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -3,8 +3,7 @@ - - + Red DarkGray @@ -25,8 +24,7 @@ 47, 12 - - + Red DarkGray @@ -299,8 +297,7 @@ 11, 12 - - + Red DarkGray @@ -326,8 +323,7 @@ - - + Red DarkGray @@ -348,8 +344,7 @@ 47, 12 - - + Red DarkGray @@ -622,8 +617,7 @@ 11, 12 - - + Red DarkGray @@ -649,8 +643,7 @@ - - + Red DarkGray @@ -671,8 +664,7 @@ 47, 12 - - + Red DarkGray @@ -945,8 +937,7 @@ 11, 12 - - + Red DarkGray @@ -1610,7 +1601,7 @@ True MiddleCenter Aqua - 768, 119 + 767, 119 SpecialLabelBlue497 1, 34 @@ -2196,7 +2187,7 @@ - 620, 263 + 620, 273 DV1PCP09 13, 22 @@ -2214,7 +2205,7 @@ - 586, 237 + 586, 245 DV1PCP01 13, 22 @@ -2543,7 +2534,7 @@ - 586, 173 + 586, 170 DV1PCP16 13, 22 @@ -2561,7 +2552,7 @@ True MiddleCenter White - 587, 178 + 588, 176 SpecialLabelBlue513 106, 3 @@ -2780,10 +2771,10 @@ True True MiddleCenter - 128, 255, 128 - 1714, 140 + Lime + 1715, 138 SpecialLabelBlue690 - 3, 83 + 1, 87 ylNormal @@ -2876,10 +2867,10 @@ True True MiddleCenter - 128, 255, 128 - 816, 140 + Lime + 816, 138 SpecialLabelBlue689 - 3, 14 + 1, 16 @@ -2894,10 +2885,10 @@ True True MiddleCenter - 128, 255, 128 - 875, 140 + Lime + 875, 138 SpecialLabelBlue688 - 3, 14 + 1, 16 @@ -2912,10 +2903,10 @@ True True MiddleCenter - 128, 255, 128 - 933, 140 + Lime + 934, 138 SpecialLabelBlue687 - 3, 14 + 1, 16 @@ -2930,10 +2921,10 @@ True True MiddleCenter - 128, 255, 128 - 1028, 139 + Lime + 1029, 138 SpecialLabelBlue686 - 3, 14 + 1, 16 @@ -2948,10 +2939,10 @@ True True MiddleCenter - 128, 255, 128 - 1087, 139 + Lime + 1088, 138 SpecialLabelBlue685 - 3, 14 + 1, 16 @@ -2966,10 +2957,10 @@ True True MiddleCenter - 128, 255, 128 - 1181, 139 + Lime + 1180, 138 SpecialLabelBlue684 - 3, 14 + 1, 18 @@ -2984,10 +2975,10 @@ True True MiddleCenter - 128, 255, 128 - 1240, 139 + Lime + 1239, 138 SpecialLabelBlue683 - 3, 14 + 1, 18 @@ -3002,10 +2993,10 @@ True True MiddleCenter - 128, 255, 128 - 1299, 138 + Lime + 1298, 137 SpecialLabelBlue682 - 3, 14 + 1, 19 @@ -3020,10 +3011,10 @@ True True MiddleCenter - 128, 255, 128 - 1358, 139 + Lime + 1357, 138 SpecialLabelBlue681 - 3, 14 + 1, 18 @@ -3038,10 +3029,10 @@ True True MiddleCenter - 128, 255, 128 - 1451, 140 + Lime + 1450, 138 SpecialLabelBlue680 - 3, 14 + 1, 18 @@ -3056,10 +3047,10 @@ True True MiddleCenter - 128, 255, 128 - 1510, 140 + Lime + 1509, 138 SpecialLabelBlue679 - 3, 14 + 1, 18 @@ -3074,10 +3065,10 @@ True True MiddleCenter - 128, 255, 128 - 1569, 140 + Lime + 1568, 138 SpecialLabelBlue678 - 3, 14 + 1, 18 @@ -3092,10 +3083,10 @@ True True MiddleCenter - 128, 255, 128 - 1629, 140 + Lime + 1627, 138 SpecialLabelBlue677 - 3, 14 + 1, 18 @@ -3110,10 +3101,10 @@ True True MiddleCenter - 128, 255, 128 - 757, 140 + Lime + 758, 138 SpecialLabelBlue676 - 3, 14 + 1, 16 @@ -3128,10 +3119,10 @@ True True MiddleCenter - 128, 255, 128 + Lime 700, 137 SpecialLabelBlue675 - 1017, 3 + 1016, 1 @@ -3814,7 +3805,7 @@ MCLabel273 41, 12 - + @@ -3828,11 +3819,11 @@ True MiddleCenter White - 652, 380 - SpecialLabelBlue644 - 3, 60 + 649, 382 + CrossTubeC2 + 3, 59 - + @@ -3846,11 +3837,11 @@ True MiddleCenter White - 652, 437 - SpecialLabelBlue645 + 652, 438 + CrossTubeC3 10, 3 - + @@ -3864,11 +3855,11 @@ True MiddleCenter White - 639, 380 - SpecialLabelBlue646 - 14, 3 + 639, 382 + CrossTubeC1 + 13, 3 - + @@ -3883,7 +3874,7 @@ MiddleCenter White 639, 410 - SpecialLabelBlue647 + CrossTubeD 22, 3 @@ -3891,7 +3882,7 @@ - 660, 407 + 660, 395 DV1PCP14 13, 22 @@ -3900,7 +3891,7 @@ - 660, 434 + 660, 432 DV1PCP13 13, 22 @@ -3909,7 +3900,7 @@ - 626, 378 + 626, 367 DV1PCP08 13, 22 @@ -3918,7 +3909,7 @@ - 626, 407 + 626, 404 DV1PCP07 13, 22 @@ -3940,7 +3931,7 @@ SpecialLabelBlue643 3, 811 - + @@ -3954,11 +3945,11 @@ True MiddleCenter White - 611, 211 - SpecialLabelBlue636 - 3, 60 + 608, 223 + CrossTubeA2 + 3, 58 - + @@ -3972,11 +3963,11 @@ True MiddleCenter White - 611, 268 - SpecialLabelBlue635 + 611, 278 + CrossTubeA3 10, 3 - + @@ -3990,11 +3981,11 @@ True MiddleCenter White - 598, 211 - SpecialLabelBlue633 - 14, 3 + 598, 223 + CrossTubeA1 + 13, 3 - + @@ -4008,8 +3999,8 @@ True MiddleCenter White - 598, 241 - SpecialLabelBlue632 + 598, 251 + CrossTubeB 22, 3 diff --git a/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin b/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin index 7f41a06..1307326 100644 --- a/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin +++ b/Main/MCEdit/Data/SharpPlugIn/Mesnac.addin @@ -1,8 +1,8 @@ - diff --git a/Main/MCEdit/Properties/Mesnac.Action.Default.resx b/Main/MCEdit/Properties/Mesnac.Action.Default.resx index 816c61e..c046cb6 100644 --- a/Main/MCEdit/Properties/Mesnac.Action.Default.resx +++ b/Main/MCEdit/Properties/Mesnac.Action.Default.resx @@ -130,7 +130,7 @@ 对不起,您选择的帐号没有权限执行此操作! - 榄菊蚊香自动配料系统 + 榄菊蚊香配料输送系统 尝试连接本地数据库失败! diff --git a/Main/MCEdit/Properties/MesnacResource.resx b/Main/MCEdit/Properties/MesnacResource.resx index 90870d7..41eca61 100644 --- a/Main/MCEdit/Properties/MesnacResource.resx +++ b/Main/MCEdit/Properties/MesnacResource.resx @@ -422,7 +422,7 @@ 确定要退出系统吗? - 榄菊蚊香自动配料系统 V1.0 + 榄菊蚊香配料输送系统 V1.0 刷新(&F) diff --git a/Main/MCEdit/Properties/MesnacResource.zh-CN.resx b/Main/MCEdit/Properties/MesnacResource.zh-CN.resx index 57f528f..4f30fd5 100644 --- a/Main/MCEdit/Properties/MesnacResource.zh-CN.resx +++ b/Main/MCEdit/Properties/MesnacResource.zh-CN.resx @@ -422,7 +422,7 @@ 确定要退出系统吗? - 榄菊蚊香自动配料系统 V1.0 + 榄菊蚊香配料输送系统 V1.0 刷新(&F) diff --git a/Main/MCRun/Data/SharpPlugIn/Mesnac.addin b/Main/MCRun/Data/SharpPlugIn/Mesnac.addin index b9ae01a..74d84e8 100644 --- a/Main/MCRun/Data/SharpPlugIn/Mesnac.addin +++ b/Main/MCRun/Data/SharpPlugIn/Mesnac.addin @@ -1,8 +1,8 @@ - diff --git a/Main/MCRun/Properties/Mesnac.Action.Default.resx b/Main/MCRun/Properties/Mesnac.Action.Default.resx index 816c61e..c046cb6 100644 --- a/Main/MCRun/Properties/Mesnac.Action.Default.resx +++ b/Main/MCRun/Properties/Mesnac.Action.Default.resx @@ -130,7 +130,7 @@ 对不起,您选择的帐号没有权限执行此操作! - 榄菊蚊香自动配料系统 + 榄菊蚊香配料输送系统 尝试连接本地数据库失败! diff --git a/Main/MCRun/Properties/MesnacResource.resx b/Main/MCRun/Properties/MesnacResource.resx index fe3eeeb..f56fa90 100644 --- a/Main/MCRun/Properties/MesnacResource.resx +++ b/Main/MCRun/Properties/MesnacResource.resx @@ -188,7 +188,7 @@ ..\images\MenuAndTools\Icons_16X16_Wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 榄菊蚊香自动配料系统 V1.0 + 榄菊蚊香配料输送系统 V1.0 提示 diff --git a/Main/MCRun/Properties/MesnacResource.zh-CN.resx b/Main/MCRun/Properties/MesnacResource.zh-CN.resx index 67e9238..bda69ff 100644 --- a/Main/MCRun/Properties/MesnacResource.zh-CN.resx +++ b/Main/MCRun/Properties/MesnacResource.zh-CN.resx @@ -188,7 +188,7 @@ ..\images\MenuAndTools\Icons_16X16_Wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 榄菊蚊香自动配料系统 V1.0 + 榄菊蚊香配料输送系统 V1.0 提示