20230707 中午提交代码

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjAction/InitDbAction.cs

@@ -0,0 +1,42 @@
+using System.Data;
+using System.Linq;
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.LjMaterial;
+
+namespace Mesnac.Action.ChemicalWeighing.LjAction
+{
+    public class InitDbAction:ChemicalWeighingAction,IAction
+    {
+        
+        private DbMCControl _materialGridControl = null;      //物料列表控件
+        private RuntimeParameter _runtime;
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime); //必须调用
+            this._runtime = runtime;
+            
+            DbMCControl  materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ActionCode").FirstOrDefault();         //获取物料数据控件
+            this._materialGridControl = materialGridControl;
+            FileControl();
+
+        }
+
+        private void FileControl()
+        {
+            DataTable table = MaterialInfoTypeHelp.GetTable(@"select ActionCode.id,code,ActionName,ActionCode.Remark,DeviceUnitId,DeviceUnit.Name
+            from ActionCode
+            left join  DeviceUnit  on ActionCode.DeviceUnitId = DeviceUnit.Id");
+            
+            if (this._materialGridControl != null && this._materialGridControl.BaseControl != null)
+            {
+                this._materialGridControl.BaseControl.BindDataSource = null;
+                this._materialGridControl.BaseControl.BindDataSource = table;
+                //DBLog("成功!");
+            }
+            else
+            {
+                ICSharpCode.Core.LoggingService<InitDbAction>.Warn("刷新物料信息失败：物料数据控件为Null...");
+            }
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Data;
+using DevExpress.DataProcessing;
 using FastReport.Data;
 using Mesnac.Codd.Session;
 
@@ -12,6 +14,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial
     {
 
 
+        protected static IDictionary<string, object> GetDefault()
+        {
+            return new Dictionary<string, object>();
+        }
+        
         public static DataTable GetTable(string sql)
         {
             DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
@@ -72,11 +79,39 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial
         } 
         
     }
+
+
+
+    public class MyNameValue
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+    
     
     public class MaterialInfoTypeHelp:DBHelp
     {
 
 
+        public static IList<MyNameValue> GetALL()
+        {
+            string sql = "select  * from MaterialInfoType ";
+            var dt = GetTable(sql);
+            IList<MyNameValue> ls = new List<MyNameValue>();
+            foreach (DataRow dr in dt.Rows)
+            {
+                ls.Add(new MyNameValue()
+                {
+                    Id = Convert.ToInt32(dr[0].ToString()),
+                    Name = dr[1].ToString()
+                });
+               
+            }
+
+            return ls;
+        }
+        
+
         public static int Exist(string materialinfoTypeName)
         {
             string sql = "select  * from MaterialInfoType where MaterialTypeName=@mName";

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs

@@ -0,0 +1,278 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.LjTanNum
+{
+    partial class FrmTankNum
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.TankCode = new System.Windows.Forms.TextBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnOK = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.TankName = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.High = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.Slow = new System.Windows.Forms.TextBox();
+            this.SlowScale = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.Lead = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.Jog = new System.Windows.Forms.TextBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // TankCode
+            // 
+            this.TankCode.Enabled = false;
+            this.TankCode.Location = new System.Drawing.Point(154, 91);
+            this.TankCode.Margin = new System.Windows.Forms.Padding(5);
+            this.TankCode.Name = "TankCode";
+            this.TankCode.Size = new System.Drawing.Size(129, 21);
+            this.TankCode.TabIndex = 14;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(248, 418);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(5);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(98, 45);
+            this.btnCancel.TabIndex = 13;
+            this.btnCancel.Text = "取消";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnOK
+            // 
+            this.btnOK.Location = new System.Drawing.Point(75, 418);
+            this.btnOK.Margin = new System.Windows.Forms.Padding(5);
+            this.btnOK.Name = "btnOK";
+            this.btnOK.Size = new System.Drawing.Size(98, 45);
+            this.btnOK.TabIndex = 12;
+            this.btnOK.Text = "确认";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(73, 43);
+            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(59, 12);
+            this.label1.TabIndex = 11;
+            this.label1.Text = "物料名称:";
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(154, 40);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(121, 20);
+            this.comboBox1.TabIndex = 15;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(73, 91);
+            this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(59, 12);
+            this.label3.TabIndex = 11;
+            this.label3.Text = "日罐编码:";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(73, 142);
+            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(59, 12);
+            this.label4.TabIndex = 11;
+            this.label4.Text = "日罐编码:";
+            // 
+            // TankName
+            // 
+            this.TankName.Enabled = false;
+            this.TankName.Location = new System.Drawing.Point(154, 142);
+            this.TankName.Margin = new System.Windows.Forms.Padding(5);
+            this.TankName.Name = "TankName";
+            this.TankName.Size = new System.Drawing.Size(129, 21);
+            this.TankName.TabIndex = 14;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(73, 189);
+            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(83, 12);
+            this.label5.TabIndex = 11;
+            this.label5.Text = "高速称量速度:";
+            // 
+            // High
+            // 
+            this.High.Location = new System.Drawing.Point(154, 189);
+            this.High.Margin = new System.Windows.Forms.Padding(5);
+            this.High.Name = "High";
+            this.High.Size = new System.Drawing.Size(129, 21);
+            this.High.TabIndex = 14;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(73, 235);
+            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(83, 12);
+            this.label6.TabIndex = 11;
+            this.label6.Text = "低速称量速度:";
+            this.label6.Click += new System.EventHandler(this.label6_Click);
+            // 
+            // Slow
+            // 
+            this.Slow.Location = new System.Drawing.Point(154, 235);
+            this.Slow.Margin = new System.Windows.Forms.Padding(5);
+            this.Slow.Name = "Slow";
+            this.Slow.Size = new System.Drawing.Size(129, 21);
+            this.Slow.TabIndex = 14;
+            this.Slow.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
+            // 
+            // SlowScale
+            // 
+            this.SlowScale.Location = new System.Drawing.Point(154, 282);
+            this.SlowScale.Margin = new System.Windows.Forms.Padding(5);
+            this.SlowScale.Name = "SlowScale";
+            this.SlowScale.Size = new System.Drawing.Size(129, 21);
+            this.SlowScale.TabIndex = 17;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(73, 285);
+            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(47, 12);
+            this.label7.TabIndex = 16;
+            this.label7.Text = "慢称值:";
+            // 
+            // Lead
+            // 
+            this.Lead.Location = new System.Drawing.Point(154, 324);
+            this.Lead.Margin = new System.Windows.Forms.Padding(5);
+            this.Lead.Name = "Lead";
+            this.Lead.Size = new System.Drawing.Size(129, 21);
+            this.Lead.TabIndex = 19;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(73, 327);
+            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(47, 12);
+            this.label8.TabIndex = 18;
+            this.label8.Text = "提前量:";
+            // 
+            // Jog
+            // 
+            this.Jog.Location = new System.Drawing.Point(154, 359);
+            this.Jog.Margin = new System.Windows.Forms.Padding(5);
+            this.Jog.Name = "Jog";
+            this.Jog.Size = new System.Drawing.Size(129, 21);
+            this.Jog.TabIndex = 21;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(73, 362);
+            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(47, 12);
+            this.label9.TabIndex = 20;
+            this.label9.Text = "点动值:";
+            // 
+            // FrmTankNum
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(453, 536);
+            this.Controls.Add(this.Jog);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.Lead);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.SlowScale);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.comboBox1);
+            this.Controls.Add(this.Slow);
+            this.Controls.Add(this.High);
+            this.Controls.Add(this.TankName);
+            this.Controls.Add(this.TankCode);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnOK);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.label1);
+            this.Name = "FrmTankNum";
+            this.Text = "日罐物料对应";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox TankCode;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnOK;
+        private Label label1;
+        private System.Windows.Forms.ComboBox comboBox1;
+        private Label label2;
+        private Label label3;
+        private Label label4;
+        private TextBox TankName;
+        private Label label5;
+        private TextBox High;
+        private Label label6;
+        private TextBox Slow;
+        private TextBox SlowScale;
+        private Label label7;
+        private TextBox Lead;
+        private Label label8;
+        private TextBox Jog;
+        private Label label9;
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs

@@ -0,0 +1,215 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using Mesnac.Action.ChemicalWeighing.LjMaterial;
+
+namespace Mesnac.Action.ChemicalWeighing.LjTanNum
+{
+    public partial class FrmTankNum : Form
+    {
+        public FrmTankNum()
+        {
+            InitializeComponent();
+        }
+
+        private TankNumCodingView _tankNumCodingView;
+        public FrmTankNum(TankNumCodingView view) : this()
+        {
+            _tankNumCodingView = view;
+            Init();
+        }
+
+        private void Init()
+        {
+            var nameValueCollection = MaterialInfoTypeHelp.GetALL();
+            this.comboBox1.DataSource = nameValueCollection;
+            comboBox1.ValueMember = "Id";
+            comboBox1.DisplayMember = "Name";
+            foreach (MyNameValue combo in comboBox1.Items)
+            {
+                if (combo.Id == _tankNumCodingView.MTypeId)
+                {
+                    comboBox1.SelectedItem = combo;
+                    break;
+                }
+            }
+
+            if (null != _tankNumCodingView)
+            {
+                this.TankCode.Text = _tankNumCodingView.TankCode;
+                this.TankName.Text = _tankNumCodingView.TankName;
+                this.High.Text = _tankNumCodingView.High.ToString();
+                this.Slow.Text = _tankNumCodingView.Slow.ToString();
+                this.SlowScale.Text = _tankNumCodingView.SlowScale.ToString();
+                this.Lead.Text = _tankNumCodingView.Lead.ToString();
+                this.Jog.Text = _tankNumCodingView.Jog.ToString();
+            }
+        }
+
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void textBox1_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void label6_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            #region check
+           
+            if (string.IsNullOrEmpty(High.Text.Trim()))
+            {
+                High.Focus();
+                MessageBox.Show("请输入高速称量速度");
+                return;
+            }
+            else
+            {
+                if (float.TryParse(High.Text.Trim(),out float a))
+                {
+                    if (a < 0 || a > 50)
+                    {
+                        High.Focus();
+                        MessageBox.Show("请输入正确高速称量速度[0.0~50.0]");
+                        return;
+                    }
+                }
+                else
+                {
+                    High.Focus();
+                    MessageBox.Show("请输入正确高速称量速度[0.0~50.0]");
+                    return;
+                }
+            }
+            
+           
+            
+            if (string.IsNullOrEmpty(Slow.Text.Trim()))
+            {
+                Slow.Focus();
+                MessageBox.Show("请输入慢速称量速度");
+                return;
+            }
+            else
+            {
+                if (float.TryParse(Slow.Text.Trim(),out float b))
+                {
+                    if (b < 0 || b > 50)
+                    {
+                        Slow.Focus();
+                        MessageBox.Show("请输入正确低速称量速度[0.0~50.0]");
+                        return;
+                    }
+                }
+                else
+                {
+                    Slow.Focus();
+                    MessageBox.Show("请输入正确低速称量速度[0.0~50.0]");
+                    return;
+                }
+            }
+           
+            
+            
+
+            if (string.IsNullOrEmpty(SlowScale.Text.Trim()))
+            {
+                SlowScale.Focus();
+                MessageBox.Show("请输入慢称值");
+                return;
+            }
+            else
+            {
+                if (float.TryParse(SlowScale.Text.Trim(),out float b))
+                {
+                    if (b < 0 || b > 10)
+                    {
+                        SlowScale.Focus();
+                        MessageBox.Show("请输入正确低速称量速度[0.0~10.0]");
+                        return;
+                    }
+                }
+                else
+                {
+                    SlowScale.Focus();
+                    MessageBox.Show("请输入正确低速称量速度[0.0~10.0]");
+                    return;
+                }
+            }
+            
+            if (string.IsNullOrEmpty(Lead.Text.Trim()))
+            {
+                Lead.Focus();
+                MessageBox.Show("请输入提前量");
+                return;
+            }
+            else
+            {
+                if (float.TryParse(Lead.Text.Trim(),out float b))
+                {
+                    if (b < 0 || b > 10)
+                    {
+                        Lead.Focus();
+                        MessageBox.Show("请输入正确低速称量速度[0.0~10.0]");
+                        return;
+                    }
+                }
+                else
+                {
+                    Lead.Focus();
+                    MessageBox.Show("请输入正确低速称量速度[0.0~10.0]");
+                    return;
+                }
+            }
+            
+            if (string.IsNullOrEmpty(Jog.Text.Trim()))
+            {
+                Jog.Focus();
+                MessageBox.Show("请输入点动值");
+                return;
+            }
+            else
+            {
+                if (float.TryParse(Lead.Text.Trim(),out float b))
+                {
+                    if (b < 0 || b > 20)
+                    {
+                        Jog.Focus();
+                        MessageBox.Show("请输入正确低速称量速度[0.0~20.0]");
+                        return;
+                    }
+                }
+                else
+                {
+                    Jog.Focus();
+                    MessageBox.Show("请输入正确低速称量速度[0.0~20.0]");
+                    return;
+                }
+            }
+            
+            #endregion
+
+
+            _tankNumCodingView.MTypeId = Convert.ToInt32(this.comboBox1.SelectedValue);
+            _tankNumCodingView.High = Convert.ToInt64(High.Text);
+            _tankNumCodingView.Slow = Convert.ToInt64(Slow.Text);
+            _tankNumCodingView.SlowScale = Convert.ToInt64(SlowScale.Text);
+            _tankNumCodingView.Lead = Convert.ToInt64(Lead.Text);
+            _tankNumCodingView.Jog = Convert.ToInt64(Jog.Text);
+
+
+            TankNumCodingDbHelp.Update(_tankNumCodingView);
+            this.DialogResult = System.Windows.Forms.DialogResult.OK;
+        }
+    }
+} 

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.resx

@@ -0,0 +1,120 @@
+<?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>
+</root>

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/InItDbAction.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Data;
+using System.Linq;
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.LjMaterial;
+
+namespace Mesnac.Action.ChemicalWeighing.LjTanNum
+{
+    public class InItDbAction:ChemicalWeighingAction,IAction
+    {
+             
+        private DbMCControl _materialGridControl = null;      //物料列表控件
+        private RuntimeParameter _runtime;
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime); //必须调用
+            this._runtime = runtime;
+
+
+            UpdateAction.OnUpdateMaterial -= Process_Event;
+            UpdateAction.OnUpdateMaterial += Process_Event;
+            
+            DbMCControl  materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local,
+                "TankNumCoding").FirstOrDefault();         //获取物料数据控件
+            this._materialGridControl = materialGridControl;
+            FileControl();
+        }
+
+        private void FileControl()
+        {
+            string sql = @"select  tank.*,mater.MaterialTypeName from TankNumCoding tank
+            left join   MaterialInfoType  mater
+            on tank.MTypeId=mater.Id";
+            DataTable table = DBHelp.GetTable(sql);
+
+            if (this._materialGridControl != null && this._materialGridControl.BaseControl != null)
+            {
+                this._materialGridControl.BaseControl.BindDataSource = null;
+                this._materialGridControl.BaseControl.BindDataSource = table;
+               
+            }
+            else
+            {
+                ICSharpCode.Core.LoggingService<InItDbAction>.Warn("刷新物料信息失败：物料数据控件为Null...");
+            }
+
+        }
+        
+        private void Process_Event(object sender, EventArgs e)
+        {
+            if (sender is RuntimeParameter)
+            {
+                this.Run(sender as RuntimeParameter);
+            }
+            else
+            {
+                this.Run(this._runtime);
+            }
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using Mesnac.Action.ChemicalWeighing.LjMaterial;
+
+namespace Mesnac.Action.ChemicalWeighing.LjTanNum
+{
+    public class TankNumCodingDbHelp:DBHelp
+    {
+
+        public static int Update(TankNumCodingView view)
+        {
+            string sql = @"update [TankNumCoding] set 
+[MTypeId] = @MTypeId,
+[High] = @High,
+[Slow] = @Slow,
+[SlowScale] = @SlowScale,
+[Lead] = @Lead,
+[Jog] = @Jog where id=@id";
+
+            IDictionary<string,object> dic = GetDefault();
+            dic.Add("@id",view.Id);
+            dic.Add("@MTypeId",view.MTypeId);
+            dic.Add("@High",view.High);
+            dic.Add("@Slow",view.Slow);
+            dic.Add("@SlowScale",view.SlowScale);
+            dic.Add("@Lead",view.Lead);
+            dic.Add("@Jog",view.Jog);
+
+            ExecuteNonQuery(sql, dic);
+            return 1;
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingView.cs

@@ -0,0 +1,51 @@
+namespace Mesnac.Action.ChemicalWeighing.LjTanNum
+{
+    public class TankNumCodingView
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string TankCode { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string TankName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int MTypeId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public float High { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public float Slow { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public float SlowScale { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public float Lead { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public float Jog { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// 小料1
+        /// </summary>
+        public string MaterialTypeName { get; set; }
+    }
+
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/UpdateAction.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Linq;
+using System.Windows.Forms;
+using ICSharpCode.Core;
+using Mesnac.Action.Base;
+
+namespace Mesnac.Action.ChemicalWeighing.LjTanNum
+{
+    public class UpdateAction:ChemicalWeighingAction,IAction
+    {
+        public static event EventHandler OnUpdateMaterial;
+        private DbMCControl _materialGridControl = null;      //物料列表控件
+        private RuntimeParameter _runtime;
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime); //必须调用
+            this._runtime = runtime;
+            
+            DbMCControl  materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local,
+                "TankNumCoding").FirstOrDefault();         //获取物料数据控件
+            this._materialGridControl = materialGridControl;
+            DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView;
+            
+            //验证是否选中某物料
+            if (clientGridView.SelectedRows.Count != 1)
+            {
+               
+                MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, 
+                    MessageBoxButtons.OK, MessageBoxIcon.Information);
+                this._runtime.IsReturn = true;
+                return;
+            }
+
+            var dataGridViewRow = clientGridView.SelectedRows[0];
+
+            TankNumCodingView actionCodeView = new TankNumCodingView()
+            {
+                Id = (int)dataGridViewRow.Cells["id"].Value,
+                TankCode = dataGridViewRow.Cells["TankCode"].Value.ToString(),
+                TankName = dataGridViewRow.Cells["TankName"].Value.ToString(), 
+                MTypeId = (int)dataGridViewRow.Cells["MTypeId"].Value,
+                High = Convert.ToInt64(dataGridViewRow.Cells["High"].Value),
+                Slow =  Convert.ToInt64(dataGridViewRow.Cells["Slow"].Value),
+                SlowScale = Convert.ToInt64(dataGridViewRow.Cells["SlowScale"].Value),
+                Lead = Convert.ToInt64(dataGridViewRow.Cells["Lead"].Value),
+                Jog =  Convert.ToInt64(dataGridViewRow.Cells["Jog"].Value)
+            };
+
+            FrmTankNum frmTankNum = new FrmTankNum(actionCodeView);
+            DialogResult result = frmTankNum.ShowDialog();
+            this._runtime.BaseControl.MCEnabled = false;
+            if (result == DialogResult.OK)
+            {
+                if (OnUpdateMaterial != null)
+                {
+                    OnUpdateMaterial(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty);
+                }
+                
+                frmTankNum.Dispose();
+               
+            }
+            
+            this._runtime.BaseControl.MCEnabled = true;
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj

@@ -214,6 +214,7 @@
     <Compile Include="Entity\SimplePstUser.cs" />
     <Compile Include="FinishBatch\GHFinshBatchHelper.cs" />
     <Compile Include="FinishBatch\SCADAHelper\AlarmRefreshActionForExtend.cs" />
+    <Compile Include="LjAction\InitDbAction.cs" />
     <Compile Include="LjMaterial\DelAction.cs" />
     <Compile Include="LjMaterial\FrmMaterial.cs">
       <SubType>Form</SubType>
@@ -226,6 +227,16 @@
     <Compile Include="LjMaterial\MaterialInfoType.cs" />
     <Compile Include="LjMaterial\MaterialInfoTypeHelp.cs" />
     <Compile Include="LjMaterial\UpdateAction.cs" />
+    <Compile Include="LjTanNum\FrmTankNum.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LjTanNum\FrmTankNum.Designer.cs">
+      <DependentUpon>FrmTankNum.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LjTanNum\InItDbAction.cs" />
+    <Compile Include="LjTanNum\TankNumCodingDbHelp.cs" />
+    <Compile Include="LjTanNum\TankNumCodingView.cs" />
+    <Compile Include="LjTanNum\UpdateAction.cs" />
     <Compile Include="MaterialManage\BarcodeReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -233,7 +244,9 @@
       <DependentUpon>BarcodeReport.cs</DependentUpon>
     </Compile>
     <Compile Include="MaterialManage\DeleteMaterialAction.cs" />
-    <Compile Include="MaterialManage\FrmMaterial.cs" />
+    <Compile Include="MaterialManage\FrmMaterial.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="MaterialManage\FrmMaterial.designer.cs" />
     <Compile Include="MaterialManage\InitMaterialFormAction.cs" />
     <Compile Include="MaterialManage\InsertMaterialAction.cs" />
@@ -454,6 +467,9 @@
     <EmbeddedResource Include="LjMaterial\FrmMaterial.resx">
       <DependentUpon>FrmMaterial.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="LjTanNum\FrmTankNum.resx">
+      <DependentUpon>FrmTankNum.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MaterialManage\BarcodeReport.resx">
       <DependentUpon>BarcodeReport.cs</DependentUpon>
     </EmbeddedResource>

Main/MCEdit/Data/EventConfig/小料称量/榄菊动作管理.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<ActionService>
+    <Design>
+        <Path path="榄菊动作管理">
+          
+            <Action action="9D78CADA5C93549947FB36734362BA76">
+              <Caption>初始化动作</Caption>
+              <Remark>初始化动作</Remark>
+            </Action>
+         
+        </Path>
+    </Design>
+
+    <DesignToRuntime>
+        <Design action="9D78CADA5C93549947FB36734362BA76">
+          <Runtime action="AFAE99F79C2DF0FA53D15BEF5EB8F7B7"/>
+        </Design>
+       
+    </DesignToRuntime>
+
+    <Runtime>
+        <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
+          <Action action="AFAE99F79C2DF0FA53D15BEF5EB8F7B7" class="Mesnac.Action.ChemicalWeighing.LjAction.InitDbAction"/>
+        </Import>
+    </Runtime>
+</ActionService>

Main/MCEdit/Data/EventConfig/小料称量/榄菊日罐物料.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<ActionService>
+    <Design>
+        
+        <Path path="榄菊日罐物料">
+          
+            <Action action="8FF23B3C80F897145295970CE02212F1">
+              <Caption>初始化日罐物料</Caption>
+              <Remark>初始化日罐物料</Remark>
+            </Action>
+            <Action action="E76E0462466504B1A7E005C8A3D355BC">
+                <Caption>修改日罐物料</Caption>
+                <Remark>修改日罐物料</Remark>
+            </Action>
+        </Path>
+    </Design>
+
+    <DesignToRuntime>
+        <Design action="8FF23B3C80F897145295970CE02212F1">
+          <Runtime action="0D8CE022436CA1F652B44BFAD371B27A"/>
+        </Design>
+
+        <Design action="E76E0462466504B1A7E005C8A3D355BC">
+            <Runtime action="E01066BF1FEA3114141E465091D04601"/>
+        </Design>
+       
+    </DesignToRuntime>
+
+    <Runtime>
+        <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
+          <Action action="0D8CE022436CA1F652B44BFAD371B27A" class="Mesnac.Action.ChemicalWeighing.LjTanNum.InItDbAction"/>
+          <Action action="E01066BF1FEA3114141E465091D04601" class="Mesnac.Action.ChemicalWeighing.LjTanNum.UpdateAction"/>
+        </Import>
+    </Runtime>
+</ActionService>
+
+
+

Main/MCEdit/Data/MCProject/SCWSProject2.mprj

@@ -27,6 +27,8 @@
       <Node Name="FormHu" Text="干混机" ToolTipText="FormHu" Tag="FormHu" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormFirst" Text="FormFirst" ToolTipText="FormFirst" Tag="FormFirst" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormMaterialInfoType" Text="物料大类" ToolTipText="FormMaterialInfoType" Tag="FormMaterialInfoType" ImageIndex="3" SelectedImageIndex="3" />
+      <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>
     <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/FormAction.xml

@@ -0,0 +1,112 @@
+
+  <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FormAction" children="Controls">
+    <Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
+      <Property name="DisplayAllColumn">False</Property>
+      <Property name="DgvColumn">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAHcAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAmlkBgoAAAAG5bqP5Y+3AQUAAAAEAAAABgsAAAAEY29kZQYMAAAADOWKqOS9nOe8lueggQEGAAAABAAAAAYNAAAACkFjdGlvbk5hbWUGDgAAAAzliqjkvZzlkI3np7ABBwAAAAQAAAAGDwAAAAROYW1lBhAAAAAG6K6+5aSHAQgAAAAEAAAABhEAAAAGUmVtYXJrBhIAAAAG5aSH5rOoCw==</Binary>
+      </Property>
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+      </Property>
+      <Property name="DoubleClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+      </Property>
+      <Property name="SelectionChangedActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+      </Property>
+      <Property name="MCKey">[DataSource1].[ActionCode]</Property>
+      <Property name="MCDataSourceID" />
+      <Property name="IsDbControl">True</Property>
+      <Property name="InitDataSource" />
+      <Property name="ActionDataSource" />
+      <Property name="BindDataSource">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw==</Binary>
+      </Property>
+      <Property name="DbOptionType">None</Property>
+      <Property name="MCVisible">True</Property>
+      <Property name="MCEnabled">True</Property>
+      <Property name="AutoGenerateColumns">False</Property>
+      <Property name="BackgroundColor">ControlLightLight</Property>
+      <Property name="ColumnHeadersHeight">30</Property>
+      <Property name="MultiSelect">False</Property>
+      <Property name="Dock">Fill</Property>
+      <Property name="Location">0, 48</Property>
+      <Property name="Name">MCDataGridView1</Property>
+      <Property name="Size">666, 359</Property>
+      <Property name="TabIndex">6</Property>
+    </Object>
+    <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.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel1" children="Controls">
+        <Property name="Format" />
+        <Property name="TextName" />
+        <Property name="NewFillColor">Red</Property>
+        <Property name="OldFillColor">DarkGray</Property>
+        <Property name="MCKey" />
+        <Property name="MCDataSourceID" />
+        <Property name="IsDbControl">False</Property>
+        <Property name="InitDataSource" />
+        <Property name="ActionDataSource" />
+        <Property name="BindDataSource" />
+        <Property name="DbOptionType">None</Property>
+        <Property name="MCVisible">True</Property>
+        <Property name="MCEnabled">True</Property>
+        <Property name="Text">需要添加请联系管理员</Property>
+        <Property name="Location">104, 18</Property>
+        <Property name="Name">MCLabel1</Property>
+        <Property name="Size">125, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton4" children="Controls">
+        <Property name="ClickActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAHAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=</Binary>
+        </Property>
+        <Property name="MCKey" />
+        <Property name="MCDataSourceID" />
+        <Property name="IsDbControl">False</Property>
+        <Property name="InitDataSource" />
+        <Property name="ActionDataSource" />
+        <Property name="BindDataSource" />
+        <Property name="DbOptionType">None</Property>
+        <Property name="MCVisible">True</Property>
+        <Property name="MCEnabled">True</Property>
+        <Property name="MCPurview">True</Property>
+        <Property name="Format" />
+        <Property name="TextName" />
+        <Property name="NewFillColor">Red</Property>
+        <Property name="OldFillColor">DarkGray</Property>
+        <Property name="Text">刷新</Property>
+        <Property name="Location">3, 4</Property>
+        <Property name="Name">MCButton4</Property>
+        <Property name="Size">70, 40</Property>
+        <Property name="TabIndex">3</Property>
+      </Object>
+      <Property name="Dock">Top</Property>
+      <Property name="Location">0, 0</Property>
+      <Property name="Name">Panel1</Property>
+      <Property name="Size">666, 48</Property>
+    </Object>
+    <Property name="LoadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlENzhDQURBNUM5MzU0OTk0N0ZCMzY3MzQzNjJCQTc2BgYAAAAP5Yid5aeL5YyW5Yqo5L2cBgcAAAAP5Yid5aeL5YyW5Yqo5L2cCw==</Binary>
+    </Property>
+    <Property name="ActivatedActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+    </Property>
+    <Property name="ReloadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+    </Property>
+    <Property name="RefreshDataActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+    </Property>
+    <Property name="BHaveAction">False</Property>
+    <Property name="MCPurview">False</Property>
+    <Property name="AllowOriginalSizeShow">False</Property>
+    <Property name="BackColor">Control</Property>
+    <Property name="Size">682, 446</Property>
+    <Property name="StartPosition">WindowsDefaultLocation</Property>
+    <Property name="Text">榄菊动作</Property>
+    <Property name="WindowState">Normal</Property>
+    <Property name="BackgroundImage" />
+    <Property name="BackgroundImageLayout">Tile</Property>
+    <Property name="Font">宋体, 9pt</Property>
+    <Property name="ForeColor">ControlText</Property>
+    <Property name="Name">FormAction</Property>
+  </Object>

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

@@ -32,7 +32,7 @@
       <Property name="Dock">Fill</Property>
       <Property name="Location">0, 48</Property>
       <Property name="Name">MCDataGridView1</Property>
-      <Property name="Size">623, 314</Property>
+      <Property name="Size">696, 339</Property>
       <Property name="TabIndex">4</Property>
     </Object>
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
@@ -135,7 +135,7 @@
       <Property name="Dock">Top</Property>
       <Property name="Location">0, 0</Property>
       <Property name="Name">Panel1</Property>
-      <Property name="Size">623, 48</Property>
+      <Property name="Size">696, 48</Property>
     </Object>
     <Property name="LoadActionList">
       <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEZGNTNDQTRFQjkxOTQ0OTNBRDY5OTBGQjEwOUUwOEE5BgYAAAAP5Yid5aeL5YyW54mp5paZBgcAAAAP5Yid5aeL5YyW54mp5paZCw==</Binary>
@@ -153,7 +153,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">639, 401</Property>
+    <Property name="Size">712, 426</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">物料大类</Property>
     <Property name="WindowState">Normal</Property>

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

@@ -0,0 +1,117 @@
+
+  <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FormTankNum" children="Controls">
+    <Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
+      <Property name="DisplayAllColumn">False</Property>
+      <Property name="DgvColumn">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACQAAAI0AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAANBwUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABg0AAAACaWQGDgAAAAbluo/lj7cBBQAAAAQAAAAGDwAAAAhUYW5rQ29kZQYQAAAADOaXpee9kOe8lueggQEGAAAABAAAAAYRAAAACFRhbmtOYW1lBhIAAAAM5pel572Q5ZCN56ewAQcAAAAEAAAABhMAAAAQTWF0ZXJpYWxUeXBlTmFtZQYUAAAABueJqeaWmQEIAAAABAAAAAYVAAAABEhpZ2gGFgAAABLpq5jpgJ/np7Dph4/pgJ/luqYBCQAAAAQAAAAGFwAAAARTbG93BhgAAAAS5oWi6YCf56ew6YeP6YCf5bqmAQoAAAAEAAAABhkAAAAJU2xvd1NjYWxlBhoAAAAJ5oWi56ew5YC8AQsAAAAEAAAABhsAAAAETGVhZAYcAAAACeaPkOWJjemHjwEMAAAABAAAAAYdAAAAA0pvZwYeAAAACeeCueWKqOWAvAs=</Binary>
+      </Property>
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+      </Property>
+      <Property name="DoubleClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlFQTFFNzEzRjM3NTI4RDQ1RTgwOUI4RUQyMjY0N28yBgYAAAAb5Yid5aeL5YyW5pel572Q54mp5paZ5YWz57O7BgcAAAAb5Yid5aeL5YyW5pel572Q54mp5paZ5YWz57O7Cw==</Binary>
+      </Property>
+      <Property name="SelectionChangedActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+      </Property>
+      <Property name="MCKey">[DataSource1].[TankNumCoding]</Property>
+      <Property name="MCDataSourceID" />
+      <Property name="IsDbControl">True</Property>
+      <Property name="InitDataSource" />
+      <Property name="ActionDataSource" />
+      <Property name="BindDataSource">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw==</Binary>
+      </Property>
+      <Property name="DbOptionType">None</Property>
+      <Property name="MCVisible">True</Property>
+      <Property name="MCEnabled">True</Property>
+      <Property name="AutoGenerateColumns">False</Property>
+      <Property name="BackgroundColor">ControlLightLight</Property>
+      <Property name="ColumnHeadersHeight">30</Property>
+      <Property name="MultiSelect">False</Property>
+      <Property name="Dock">Fill</Property>
+      <Property name="Location">0, 48</Property>
+      <Property name="Name">MCDataGridView1</Property>
+      <Property name="Size">888, 525</Property>
+      <Property name="TabIndex">7</Property>
+    </Object>
+    <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.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton4" children="Controls">
+        <Property name="ClickActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEI2N0E5NTc1QkY2MTQyNkJBQTNEMzcwQkM0QkRENDc3BgYAAAAP5Yid5aeL5YyW54mp5paZBgcAAAAP5Yid5aeL5YyW54mp5paZCw==</Binary>
+        </Property>
+        <Property name="MCKey" />
+        <Property name="MCDataSourceID" />
+        <Property name="IsDbControl">False</Property>
+        <Property name="InitDataSource" />
+        <Property name="ActionDataSource" />
+        <Property name="BindDataSource" />
+        <Property name="DbOptionType">None</Property>
+        <Property name="MCVisible">True</Property>
+        <Property name="MCEnabled">True</Property>
+        <Property name="MCPurview">True</Property>
+        <Property name="Format" />
+        <Property name="TextName" />
+        <Property name="NewFillColor">Red</Property>
+        <Property name="OldFillColor">DarkGray</Property>
+        <Property name="Text">刷新</Property>
+        <Property name="Location">89, 3</Property>
+        <Property name="Name">MCButton4</Property>
+        <Property name="Size">70, 40</Property>
+        <Property name="TabIndex">3</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton2" children="Controls">
+        <Property name="ClickActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEU3NkUwNDYyNDY2NTA0QjFBN0UwMDVDOEEzRDM1NUJDBgYAAAAS5L+u5pS55pel572Q54mp5paZBgcAAAAS5L+u5pS55pel572Q54mp5paZCw==</Binary>
+        </Property>
+        <Property name="MCKey" />
+        <Property name="MCDataSourceID" />
+        <Property name="IsDbControl">False</Property>
+        <Property name="InitDataSource" />
+        <Property name="ActionDataSource" />
+        <Property name="BindDataSource" />
+        <Property name="DbOptionType">None</Property>
+        <Property name="MCVisible">True</Property>
+        <Property name="MCEnabled">True</Property>
+        <Property name="MCPurview">True</Property>
+        <Property name="Format" />
+        <Property name="TextName" />
+        <Property name="NewFillColor">Red</Property>
+        <Property name="OldFillColor">DarkGray</Property>
+        <Property name="Text">修改</Property>
+        <Property name="Location">9, 3</Property>
+        <Property name="Name">MCButton2</Property>
+        <Property name="Size">70, 40</Property>
+        <Property name="TabIndex">1</Property>
+      </Object>
+      <Property name="Dock">Top</Property>
+      <Property name="Location">0, 0</Property>
+      <Property name="Name">Panel1</Property>
+      <Property name="Size">888, 48</Property>
+    </Object>
+    <Property name="LoadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAPAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhGRjIzQjNDODBGODk3MTQ1Mjk1OTcwQ0UwMjIxMkYxBgYAAAAV5Yid5aeL5YyW5pel572Q54mp5paZBgcAAAAV5Yid5aeL5YyW5pel572Q54mp5paZCw==</Binary>
+    </Property>
+    <Property name="ActivatedActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+    </Property>
+    <Property name="ReloadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+    </Property>
+    <Property name="RefreshDataActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+    </Property>
+    <Property name="BHaveAction">False</Property>
+    <Property name="MCPurview">False</Property>
+    <Property name="AllowOriginalSizeShow">False</Property>
+    <Property name="BackColor">Control</Property>
+    <Property name="Size">904, 612</Property>
+    <Property name="StartPosition">WindowsDefaultLocation</Property>
+    <Property name="Text">日罐物料</Property>
+    <Property name="WindowState">Normal</Property>
+    <Property name="BackgroundImage" />
+    <Property name="BackgroundImageLayout">Tile</Property>
+    <Property name="Font">宋体, 9pt</Property>
+    <Property name="ForeColor">ControlText</Property>
+    <Property name="Name">FormTankNum</Property>
+  </Object>

Main/MCEdit/MCEdit.csproj

@@ -191,6 +191,14 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Data\EventConfig\小料称量\日志.系统日志.xml" />
+    <Content Include="Data\EventConfig\小料称量\榄菊动作管理.xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Data\EventConfig\小料称量\榄菊日罐物料.xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Data\EventConfig\小料称量\榄菊物料管理.xml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>