From f03b412359300593cfd5ccce712f3f1f1164c275 Mon Sep 17 00:00:00 2001 From: nodyang Date: Tue, 11 Jul 2023 10:37:42 +0800 Subject: [PATCH] qw3 --- .../Test/TestAction.cs | 16 + .../FenChaXian.Designer.cs | 63 + .../FenChaXian.cs | 20 + .../FenChaXian.resx | 176 ++ .../Mesnac.Controls.ChemicalWeighing.csproj | 10 + .../Resources/fenchaxian.png | Bin 0 -> 2848 bytes Main/MCEdit/Data/ComponentEvent.xml | 2 + Main/MCEdit/Data/ComponentProperty.xml | 13 + Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 1 + Main/MCEdit/Data/MCProject/nodeDevice.xml | 1798 ++++++++++++++++ Main/MCEdit/Data/MCProject/nodeForm/Form1.xml | 23 +- .../Data/MCProject/nodeForm/FormDeliver.xml | 1863 +++++++++++++++++ .../Data/MCProject/nodeForm/FormMachine.xml | 6 +- .../Data/SharpDevelopControlLibrary.xml | 4 + 14 files changed, 3986 insertions(+), 9 deletions(-) create mode 100644 Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs create mode 100644 Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.cs create mode 100644 Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx create mode 100644 Controls/Mesnac.Controls.ChemicalWeighing/Resources/fenchaxian.png create mode 100644 Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs index 384a6dc..e64a46d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; @@ -7,6 +8,7 @@ using ICSharpCode.Core; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Basic; +using Mesnac.Codd.Session; using Mesnac.Controls.Base; using Mesnac.Controls.Default; @@ -17,6 +19,20 @@ namespace Mesnac.Action.ChemicalWeighing.Test public void Run(RuntimeParameter runtime) { base.RunIni(runtime); //必须调用 + + + string sql = "insert into ActionCode values (13,'test','',1) select @@IDENTITY"; + + DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); + if (dbHelper == null) + { + throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); + } + dbHelper.ClearParameter(); + dbHelper.CommandType = CommandType.Text; + dbHelper.CommandText = sql; + + dbHelper.ExecuteNonQuery(); //ParametersWithPc.B1.FirstWord 256 768 diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs new file mode 100644 index 0000000..598894a --- /dev/null +++ b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs @@ -0,0 +1,63 @@ +namespace Mesnac.Controls.ChemicalWeighing +{ + partial class FenChaXian + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FenChaXian)); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(118, 150); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // FenChaXian + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.pictureBox1); + this.Name = "FenChaXian"; + this.Size = new System.Drawing.Size(118, 150); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + } +} diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.cs b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.cs new file mode 100644 index 0000000..156f122 --- /dev/null +++ b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesnac.Controls.ChemicalWeighing +{ + public partial class FenChaXian : UserControl + { + public FenChaXian() + { + InitializeComponent(); + } + } +} diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx new file mode 100644 index 0000000..db0d553 --- /dev/null +++ b/Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + + + \ No newline at end of file diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj index 69b9b2f..786ef82 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj +++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj @@ -83,6 +83,12 @@ Dou.cs + + UserControl + + + FenChaXian.cs + UserControl @@ -305,6 +311,9 @@ Dou.cs + + FenChaXian.cs + GanHunJi.cs @@ -494,6 +503,7 @@ + diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/fenchaxian.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/fenchaxian.png new file mode 100644 index 0000000000000000000000000000000000000000..0e06b2efeac28589eafd16adbdf389b81918f247 GIT binary patch literal 2848 zcmeHJ={wtr7XAfAtyA0FhH!OIJ42}mHEOFZV_(}+BUR#xr41>KPK%IM6%lJFYU$W2 zmgpwb916#CJ4iouXTLX~szJ|NPV4Uu_p7Y}?%f@pa+mR^ zWNkvcFY740kFeHlI79fu_er|0c7~e1_x-Q6EmJl%V67wd%ak0D&+z=&dd?lK6meyO z#VzfV%J-ZKM#{P7^2gRzHg{}(U3Kd0B*bU*kDp_bQUcceq=R8F|Izx!)s^rZ4&0^z z%@KZH!1eE5XV{OcG1;#~+dh5&&yfr3569nb;Q42fx`^>-%YDx3E_rv}wJB%57h=ZL z{v6W3*no~)o()NNlwy|EX$-EPWkd`(wU1{Zz@8r$^JH3j{El8nDWsV>Q65TzpXLj7DYjrFhFd@A zy8W=X+z0km4fl8=_C_CT$1aK-|2;)yz2TV@OcQos;o%9nedau~ylFo$=}xTctpvTX zX$>HmU$)F%Fy@I^DEoTu8GQNPUqs^;Dk0`Z7iNlR2DC$eSJsZpBQj;n&v&6#Gd{6+ zM^Xt&``i=8x+K|RfIEHa02fa4&qhjrn#0t;{Od2H0m|{v#{{26?L=^vHzlnnpA&SD zW7+wY%+qjS;xCu&dx9=g#ys0H+PS*8 z0^34@cBsLZ=fMRPaU^xCv@&2<7l+JUrq)C~k^J47YnbLwsn*r?ECtQSKQxtsL*b?S zv{L5@s>sGdFM{RNL7JmuwIH?+9g4;g{j-GkyDG z@I9!18d#o0A;gVK*7% z2YY@)FbSjO!ulgiEi3y7W*{cA*F5ATG%b05n~?gH_$GCQ@}-#fgHMH~ww)z{C2Sf$ zB|_{m*ulvy+59}6rjYnel1mocUjEL4A|}b9QZ8>`dN1F!TEA9|*|)WCAWz8qtq%je zaBJ36I)$DA4j&WQs3W8zXfC6ok`Omkx`Lu6iQ&5)AT@UdF(E5sz-`lD_1-6t{|v!? z=%H7ilZ`vU8|dl1Z|p&;@gh4Uc;C9venqkx2hDZxR(6A=? zY1owaNLOx>SQpA{_|`T5mdEt#`&l zl1{}B{?0ObklD6!8U1QmuVMcU**C6=%GNbMEp4AQ6e8Drc0U`U!Jrn#HRek$VIm|H z%|@d`t;+qH$hgX|LG4E8>+dGO_>o$VZ2>gyv!W!TsCA}mais7~TF9G0tPBh;pz?rt z-*m;Fo(EPS$Lqb|w7jSY@-vwiSGcUDdUIc*vaFF?JDYa3rSO7rA@easa#1VXv}MY# zxWBdO(fR6?ZCa;jmuyFHvE8JN625`0A;-2y4<2K6@`>~)Qi@-m>@&}{R2OR_HV@DxgzYrZ z!f~TK;^DRSx5=RSEuw|n3}`-1FA@LeB^VQD*eE>UBZ4`7!+R8=J;er&7G3hC6H#7~$>bg%DHJk%udsX3sPU!+c7i>)UmFq}i5l$$ zg)KZ(#Jj5Ty!3T>0E%^e<3%a2CS{$$BGF2f`rZx4O|J%(s7v%IWKxuv31q9@88WOx zp?wIaSCVNQrTI~t_e`nM{)gW0826NrYv|FFyxcpWtu9nLvDF9@lgt4oiv8 zyw2T&JL{Pt@uCrg;_nApe%t0)as9AT@=(5+9E|Gs>E&a~GM%-x#r6!1Y z(jide9tgu;D%S{7h_hI@uPUdge>ECBmZvbSX=*Gd-h%eYjHWhVl4`l`RxnAmln@6{ b$0~KEdnEhNMCS?r^93C3;I@qygYW$prWbV3 literal 0 HcmV?d00001 diff --git a/Main/MCEdit/Data/ComponentEvent.xml b/Main/MCEdit/Data/ComponentEvent.xml index 804232d..166e327 100644 --- a/Main/MCEdit/Data/ComponentEvent.xml +++ b/Main/MCEdit/Data/ComponentEvent.xml @@ -139,5 +139,7 @@ + + diff --git a/Main/MCEdit/Data/ComponentProperty.xml b/Main/MCEdit/Data/ComponentProperty.xml index 9efe8b2..4016793 100644 --- a/Main/MCEdit/Data/ComponentProperty.xml +++ b/Main/MCEdit/Data/ComponentProperty.xml @@ -1644,5 +1644,18 @@ + + + + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index 96a059b..1cce276 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -30,6 +30,7 @@ + diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index 08833b9..ff1bcdb 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -6524,6 +6524,1804 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml index 0816a02..5ac97d6 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml @@ -1,6 +1,21 @@ + + + fmTurnOn + 1022, 217 + FaMen32 + 40, 38 + + + HslConveyer1 + 142, 196, 216 + 20 + 195, 574 + HslConveyer1 + 461, 61 + ylAlarm @@ -9,10 +24,6 @@ 13, 13 - parameterswithpc.b1.emstop - true - parameterswithpc.b1.firstword - true 104, 635 ThreeWayValve1 56, 60 @@ -685,7 +696,7 @@ Fill 0, 0 Panel1 - 1769, 1112 + 1769, 1061 AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -703,7 +714,7 @@ False False Control - 1785, 1151 + 1785, 1100 WindowsDefaultLocation 主要用来测试 Normal diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml new file mode 100644 index 0000000..0f2c61a --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml @@ -0,0 +1,1863 @@ + + + + + 255, 93 + Dou1 + 43, 49 + + + 50 + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 346, 664 + HslBottle18 + 81, 115 + + + + + + + False + + + + None + True + True + MiddleCenter + Highlight + 2596, 35 + SpecialLabelBlue193 + 2, 150 + + + + + + + False + + + + None + True + True + MiddleCenter + Highlight + 2340, 110 + SpecialLabelBlue192 + 2, 100 + + + + + + + False + + + + None + True + True + MiddleCenter + Highlight + 2578, 85 + SpecialLabelBlue191 + 2, 118 + + + + + + + False + + + + None + True + True + MiddleCenter + Highlight + 2318, 63 + SpecialLabelBlue190 + 2, 150 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 2651, 128 + SpecialLabelBlue189 + 2, 110 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 2523, 127 + SpecialLabelBlue188 + 2, 98 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 2267, 155 + SpecialLabelBlue187 + 2, 72 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 2395, 154 + SpecialLabelBlue186 + 2, 82 + + + + + + zsTurnOn + 81, 10 + Fan7 + 68, 68 + + + + + zsTurnOn + 145, 65 + Fan8 + 68, 68 + + + + + zsTurnOn + 17, 53 + Fan9 + 68, 68 + + + + + Red + DarkGray + + + False + + + + None + True + True + 4# + MenuHighlight + 136, 397 + MCLabel146 + 17, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 3# + MenuHighlight + 67, 397 + MCLabel145 + 17, 12 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 105, 197 + SpecialLabelBlue179 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 97, 189 + SpecialLabelBlue180 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 131, 312 + SpecialLabelBlue181 + 2, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 76, 318 + SpecialLabelBlue182 + 1, 38 + + + 116, 348 + BeiLiaoTong5 + 42, 35 + + + 67, 297 + GanHunJi5 + 80, 18 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 159, 163 + SpecialLabelBlue183 + 2, 38 + + + 136, 194 + RightTong3 + 30, 55 + + + + ylNormal + 84, 159 + AlarmLight5 + 13, 13 + + + + ylNormal + 24, 92 + AlarmLight6 + 13, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 29, 156 + SpecialLabelBlue184 + 1, 38 + + + 26, 194 + LeftTong4 + 30, 55 + + + 49, 348 + BeiLiaoTong6 + 42, 35 + + + + fmTurnOff + 90, 174 + FaMen89 + 10, 20 + + + 50 + 小料 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 84, 194 + HslBottle27 + 30, 103 + + + + fmTurnOff + 89, 136 + FaMen90 + 10, 20 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 89, 127 + SpecialLabelBlue185 + 2, 29 + + + 62, 156 + GanHunJi6 + 80, 18 + + + 50 + 日罐 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 145, 82 + HslBottle28 + 24, 78 + + + 50 + 小料 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 77, 26 + HslBottle29 + 30, 103 + + + 50 + 日罐 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 17, 78 + HslBottle30 + 24, 78 + + 2495, 171 + Panel8 + 195, 416 + + + + + + zsTurnOn + 81, 10 + Fan6 + 68, 68 + + + + + zsTurnOn + 145, 65 + Fan5 + 68, 68 + + + + + zsTurnOn + 17, 53 + Fan4 + 68, 68 + + + + + Red + DarkGray + + + False + + + + None + True + True + 4# + MenuHighlight + 136, 397 + MCLabel147 + 17, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 3# + MenuHighlight + 67, 397 + MCLabel149 + 17, 12 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 105, 197 + SpecialLabelBlue172 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 97, 189 + SpecialLabelBlue173 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 131, 312 + SpecialLabelBlue174 + 2, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 76, 318 + SpecialLabelBlue175 + 1, 38 + + + 116, 348 + BeiLiaoTong3 + 42, 35 + + + 67, 297 + GanHunJi3 + 80, 18 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 159, 163 + SpecialLabelBlue176 + 2, 38 + + + 136, 194 + RightTong2 + 30, 55 + + + + ylNormal + 84, 159 + AlarmLight3 + 13, 13 + + + + ylNormal + 24, 92 + AlarmLight4 + 13, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 29, 156 + SpecialLabelBlue177 + 1, 38 + + + 26, 194 + LeftTong3 + 30, 55 + + + 49, 348 + BeiLiaoTong4 + 42, 35 + + + + fmTurnOff + 90, 174 + FaMen87 + 10, 20 + + + 50 + 小料 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 84, 194 + HslBottle23 + 30, 103 + + + + fmTurnOff + 89, 136 + FaMen88 + 10, 20 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 89, 127 + SpecialLabelBlue178 + 2, 29 + + + 62, 156 + GanHunJi4 + 80, 18 + + + 50 + 日罐 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 145, 82 + HslBottle24 + 24, 78 + + + 50 + 小料 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 77, 26 + HslBottle25 + 30, 103 + + + 50 + 日罐 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 17, 78 + HslBottle26 + 24, 78 + + 2241, 174 + Panel7 + 195, 416 + + + + + + + False + + + + None + True + True + MiddleCenter + Highlight + 2107, 61 + SpecialLabelBlue171 + 2, 135 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1977, 110 + SpecialLabelBlue170 + 361, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1975, 85 + SpecialLabelBlue169 + 2, 30 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1852, 83 + SpecialLabelBlue168 + 730, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1852, 80 + SpecialLabelBlue167 + 2, 400 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1778, 482 + SpecialLabelBlue166 + 74, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 2157, 157 + SpecialLabelBlue165 + 2, 78 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 2029, 157 + SpecialLabelBlue162 + 2, 70 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1967, 155 + SpecialLabelBlue160 + 430, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1967, 127 + SpecialLabelBlue161 + 2, 30 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1831, 125 + SpecialLabelBlue159 + 822, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1831, 127 + SpecialLabelBlue158 + 2, 330 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1783, 458 + SpecialLabelBlue157 + 54, 2 + + + + fmTurnOn + 2087, 112 + FaMen86 + 38, 30 + + + + + + + False + + + + None + True + True + MiddleCenter + Highlight + 2087, 95 + SpecialLabelBlue156 + 2, 85 + + + + fmTurnOn + 1975, 22 + FaMen85 + 38, 30 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1967, 61 + SpecialLabelBlue155 + 351, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + White + 1967, 37 + SpecialLabelBlue154 + 2, 30 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1817, 35 + SpecialLabelBlue153 + 781, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1817, 32 + SpecialLabelBlue152 + 2, 410 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 1778, 438 + SpecialLabelBlue151 + 44, 2 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 2# + MenuHighlight + 136, 395 + MCLabel150 + 17, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 1# + MenuHighlight + 59, 395 + MCLabel151 + 17, 12 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 105, 197 + SpecialLabelBlue164 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 97, 189 + SpecialLabelBlue163 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 131, 312 + SpecialLabelBlue150 + 2, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 76, 318 + SpecialLabelBlue149 + 1, 38 + + + 116, 348 + BeiLiaoTong2 + 42, 35 + + + 67, 297 + GanHunJi2 + 80, 18 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 159, 163 + SpecialLabelBlue148 + 2, 38 + + + 136, 194 + RightTong1 + 30, 55 + + + + ylNormal + 84, 159 + AlarmLight2 + 13, 13 + + + + ylNormal + 26, 100 + AlarmLight1 + 13, 13 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 29, 156 + SpecialLabelBlue147 + 1, 38 + + + 26, 194 + LeftTong2 + 30, 55 + + + 49, 348 + BeiLiaoTong1 + 42, 35 + + + + + zsTurnOn + 77, 14 + Fan3 + 68, 68 + + + + fmTurnOff + 90, 174 + FaMen84 + 10, 20 + + + 50 + 小料 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 84, 194 + HslBottle22 + 30, 103 + + + + fmTurnOff + 89, 136 + FaMen83 + 10, 20 + + + + + zsTurnOn + 14, 45 + Fan2 + 68, 68 + + + + + zsTurnOn + 146, 55 + Fan1 + 68, 68 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 89, 127 + SpecialLabelBlue146 + 2, 29 + + + 62, 156 + GanHunJi1 + 80, 18 + + + 50 + 日罐 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 145, 82 + HslBottle21 + 24, 78 + + + 50 + 小料 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 77, 26 + HslBottle20 + 30, 103 + + + 50 + 日罐 + + 194, 190, 77 + 226, 221, 98 + 243, 245, 139 + 142, 196, 216 + 240, 240, 240 + 151, 232, 244 + 17, 78 + HslBottle19 + 24, 78 + + 2003, 174 + Panel6 + 195, 416 + + + + + Red + DarkGray + + + False + + + + None + True + True + 碳粉 + Yellow + 197, 48 + lbltanfen + 29, 12 + + + 177, 48 + HslTruck2 + 72, 43 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 385, 48 + SpecialLabelBlue42 + 1, 580 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 310, 62 + SpecialLabelBlue39 + 75, 1 + + + 381, 29 + SheBei1 + 13, 18 + + + + fmTurnOff + 247, 272 + FaMen5 + 15, 17 + + + + fmTurnOff + 311, 270 + FaMen4 + 15, 17 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 326, 255 + SpecialLabelBlue14 + 38, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 207, 254 + SpecialLabelBlue13 + 38, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 346, 204 + SpecialLabelBlue11 + 24, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 370, 206 + SpecialLabelBlue12 + 2, 95 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 207, 203 + SpecialLabelBlue10 + 24, 1 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 208, 205 + SpecialLabelBlue9 + 1, 98 + + + + fmTurnOff + 172, 254 + FaMen3 + 10, 20 + + + 287, 190 + LouDou3 + 56, 83 + + + 227, 189 + LouDou2 + 56, 83 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 153, 239 + SpecialLabelBlue8 + 217, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 172, 240 + SpecialLabelBlue5 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 157, 241 + SpecialLabelBlue4 + 1, 38 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 127, 279 + SpecialLabelBlue3 + 52, 2 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 126, 95 + SpecialLabelBlue1 + 2, 750 + + + + + + + False + + + + None + True + True + MiddleCenter + 0, 199, 140 + 108, 93 + SpecialLabelBlue2 + 20, 1 + + + 244, 56 + Trucks1 + 66, 34 + + + 12, 37 + QiGuanDanYuan1 + 99, 74 + + + + CWSS_PLC.DB100.PLC_ConnectState + sssStop + 16, 3 + StateButton1 + 50, 54 + + + + + Red + DarkGray + + + False + + + + None + True + True + 系统急停 + 黑体, 9.75pt + ControlLightLight + 16, 149 + MCLabel171 + 63, 13 + + + + + Red + DarkGray + + + False + + + + None + True + True + PLC连接状态 + 黑体, 9.75pt + ControlLightLight + 6, 62 + MCLabel154 + 84, 13 + + + CWSS_PLC.DB100.PLC_SystemStop + sssStop + 16, 92 + SystemStateShow1 + 55, 54 + + 12, 146 + Panel2 + 91, 174 + + 32, 72, 98 + Fill + 0, 0 + Panel1 + 1339, 1177 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 1355, 1216 + WindowsDefaultLocation + 榄菊输送节点 + Normal + + Tile + 宋体, 9pt + ControlText + FormDeliver + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormMachine.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormMachine.xml index ebb2016..d98da5b 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormMachine.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormMachine.xml @@ -4239,7 +4239,7 @@ 日罐A7_SensorPressure ylMove - 167, 69 + 152, 70 PressureSwitch6 13, 13 @@ -4859,7 +4859,7 @@ Fill 0, 0 Panel1 - 2754, 1421 + 1924, 997 AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -4877,7 +4877,7 @@ False False Control - 2770, 1460 + 1940, 1036 WindowsDefaultLocation 干湿机器 Normal diff --git a/Main/MCEdit/Data/SharpDevelopControlLibrary.xml b/Main/MCEdit/Data/SharpDevelopControlLibrary.xml index fd1640a..c2abae2 100644 --- a/Main/MCEdit/Data/SharpDevelopControlLibrary.xml +++ b/Main/MCEdit/Data/SharpDevelopControlLibrary.xml @@ -123,6 +123,10 @@ + + + +