qw3

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;
 
@@ -19,6 +21,20 @@ namespace Mesnac.Action.ChemicalWeighing.Test
             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
 
             //badc1el26587193265870

Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.Designer.cs

@@ -0,0 +1,63 @@
+namespace Mesnac.Controls.ChemicalWeighing
+{
+    partial class FenChaXian
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        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;
+    }
+}

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();
+        }
+    }
+}

Controls/Mesnac.Controls.ChemicalWeighing/FenChaXian.resx

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+</root>

Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj

@@ -83,6 +83,12 @@
     <Compile Include="Dou.Designer.cs">
       <DependentUpon>Dou.cs</DependentUpon>
     </Compile>
+    <Compile Include="FenChaXian.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="FenChaXian.Designer.cs">
+      <DependentUpon>FenChaXian.cs</DependentUpon>
+    </Compile>
     <Compile Include="GanHunJi.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -305,6 +311,9 @@
     <EmbeddedResource Include="Dou.resx">
       <DependentUpon>Dou.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FenChaXian.resx">
+      <DependentUpon>FenChaXian.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="GanHunJi.resx">
       <DependentUpon>GanHunJi.cs</DependentUpon>
     </EmbeddedResource>
@@ -494,6 +503,7 @@
     <EmbeddedResource Include="Resources\BeiLiaoTong.png" />
     <EmbeddedResource Include="Resources\leftTong.png" />
     <EmbeddedResource Include="Resources\rightTong.png" />
+    <Content Include="Resources\fenchaxian.png" />
     <Content Include="Resources\qiguan.png" />
     <EmbeddedResource Include="Resources\ThreeWayValve0.png" />
     <EmbeddedResource Include="Resources\ThreeWayValve1.png" />

Main/MCEdit/Data/ComponentEvent.xml

@@ -139,5 +139,7 @@
         <Property Name="SelectionChangedActionList" Caption="选择" Group="事件" ControlPropertyName="SelectionChanged"/>
       </Propertys>
     </Component>
+    
+  
     <!--小料组件结束-->
 </Components>

Main/MCEdit/Data/ComponentProperty.xml

@@ -1644,5 +1644,18 @@
         </DataBinding>
     </Component>
     
+   <!--    三叉-->
+    <Component Name="FenChaXian" Namespace="Mesnac.Controls.ChemicalWeighing" Asm="Mesnac.Controls.ChemicalWeighing.dll">
+        <Propertys>
+            <Property Name="Location" Caption="位置" Group=""/>
+            <Property Name="Name" Caption="名称" Group=""/>
+            <Property Name="Size" Caption="大小" Group=""/>
+        </Propertys>
+        <DataBinding>
+
+        </DataBinding>
+    </Component>
+
+    
     
 </Components>

Main/MCEdit/Data/MCProject/SCWSProject2.mprj

@@ -30,6 +30,7 @@
       <Node Name="FormAction" Text="榄菊动作" ToolTipText="FormAction" Tag="FormAction" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormTankNum" Text="日罐物料" ToolTipText="FormTankNum" Tag="FormTankNum" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormStock" Text="料仓物料" ToolTipText="FormStock" Tag="FormStock" ImageIndex="3" SelectedImageIndex="3" />
+      <Node Name="FormDeliver" Text="榄菊输送节点" ToolTipText="FormDeliver" Tag="FormDeliver" ImageIndex="3" SelectedImageIndex="3" />
     </Node>
     <Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2">
       <Node Name="ParametersWithPc" Text="ParametersWithPc" ToolTipText="" Tag="ParametersWithPc" ImageIndex="5" SelectedImageIndex="5" />

Main/MCEdit/Data/MCProject/nodeForm/Form1.xml

@@ -1,6 +1,21 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Form1" children="Controls">
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.FaMen, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FaMen32" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Status">fmTurnOn</Property>
+        <Property name="Location">1022, 217</Property>
+        <Property name="Name">FaMen32</Property>
+        <Property name="Size">40, 38</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.HslConveyer, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslConveyer1" children="Controls">
+        <Property name="Text">HslConveyer1</Property>
+        <Property name="ForeColor">142, 196, 216</Property>
+        <Property name="CircularRadius">20</Property>
+        <Property name="Location">195, 574</Property>
+        <Property name="Name">HslConveyer1</Property>
+        <Property name="Size">461, 61</Property>
+      </Object>
       <Object type="Mesnac.Controls.Feeding.PressureSwitch, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PressureSwitch1" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">ylAlarm</Property>
@@ -9,10 +24,6 @@
         <Property name="Size">13, 13</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="ThreeWayValve1" children="Controls">
-        <Property name="ZLT">parameterswithpc.b1.emstop</Property>
-        <Property name="ZLD">true</Property>
-        <Property name="ALMT">parameterswithpc.b1.firstword</Property>
-        <Property name="ALMD">true</Property>
         <Property name="Location">104, 635</Property>
         <Property name="Name">ThreeWayValve1</Property>
         <Property name="Size">56, 60</Property>
@@ -685,7 +696,7 @@
       <Property name="Dock">Fill</Property>
       <Property name="Location">0, 0</Property>
       <Property name="Name">Panel1</Property>
-      <Property name="Size">1769, 1112</Property>
+      <Property name="Size">1769, 1061</Property>
     </Object>
     <Property name="LoadActionList">
       <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@@ -703,7 +714,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">1785, 1151</Property>
+    <Property name="Size">1785, 1100</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">主要用来测试</Property>
     <Property name="WindowState">Normal</Property>

Main/MCEdit/Data/MCProject/nodeForm/FormMachine.xml

@@ -4239,7 +4239,7 @@
         <Object type="Mesnac.Controls.Feeding.PressureSwitch, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PressureSwitch6" children="Controls">
           <Property name="StatusName">日罐A7_SensorPressure</Property>
           <Property name="Status">ylMove</Property>
-          <Property name="Location">167, 69</Property>
+          <Property name="Location">152, 70</Property>
           <Property name="Name">PressureSwitch6</Property>
           <Property name="Size">13, 13</Property>
         </Object>
@@ -4859,7 +4859,7 @@
       <Property name="Dock">Fill</Property>
       <Property name="Location">0, 0</Property>
       <Property name="Name">Panel1</Property>
-      <Property name="Size">2754, 1421</Property>
+      <Property name="Size">1924, 997</Property>
     </Object>
     <Property name="LoadActionList">
       <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@@ -4877,7 +4877,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">2770, 1460</Property>
+    <Property name="Size">1940, 1036</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">干湿机器</Property>
     <Property name="WindowState">Normal</Property>

Main/MCEdit/Data/SharpDevelopControlLibrary.xml

@@ -124,6 +124,10 @@
 			<ToolComponent chineseName="纵向管道" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.HslPipeLineV" />
 			<ToolComponent chineseName="直斜管道" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.ThreeWayValve" />
 
+            <ToolComponent chineseName="分叉线" assembly="3" enabled="True" class="Mesnac.Controls.ChemicalWeighing.FenChaXian" />
+            
+            
+			
 		</Category>
 		
     </Categories>