修复完成

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

@@ -0,0 +1,75 @@
+using System;
+using System.Linq;
+using System.Windows.Forms;
+using Mesnac.Action.Base;
+
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+   
+    
+     public class DelAction:ChemicalWeighingAction,IAction
+    {
+        private DbMCControl _clientGridControl = null;      //用户列表控件
+        
+        /// <summary>
+        /// 新增物料事件定义
+        /// </summary>
+        public static event EventHandler OnDelMaterial;
+        
+        private RuntimeParameter _runtime;
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime); //必须调用
+            this._runtime = runtime;
+            DoWork();
+        }
+        
+        private void DoWork()
+        {
+            
+            
+            
+            DbMCControl clientGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "MaterialInfoType").FirstOrDefault();
+            
+            if (clientGridControl == null)
+            {
+                ICSharpCode.Core.LoggingService<UpdateAction>.Error("缺少物料信息列表控件...");
+                return;
+            }
+          
+            this._clientGridControl = clientGridControl;
+            DataGridView clientGridView = this._clientGridControl.BaseControl as DataGridView;
+
+           
+            //验证是否选中某物料
+            if (clientGridView.SelectedRows.Count != 1)
+            {
+                string msg1 = "请选择一条要删除的物料!";      //请选择一项要修改的物料!
+                MessageBox.Show(msg1, Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                this._runtime.IsReturn = true;
+                return;
+            }
+
+            int id =(int) clientGridView.SelectedRows[0].Cells[0].Value;
+            var name = clientGridView.SelectedRows[0].Cells[1].Value as string;
+            
+            
+            DialogResult result = MessageBox.Show("确定删除", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+            if (result == DialogResult.Yes)
+            {
+                this._runtime.BaseControl.MCEnabled = false;
+                MaterialInfoTypeHelp.Del(id);
+                if (OnDelMaterial != null)
+                {
+                    OnDelMaterial(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty);
+                }
+
+              
+            }
+            this._runtime.BaseControl.MCEnabled = true;
+         
+            
+           
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs

@@ -0,0 +1,105 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+    partial class FrmMaterial
+    {
+        /// <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.MNameTB = 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.SuspendLayout();
+            // 
+            // MNameTB
+            // 
+            this.MNameTB.Location = new System.Drawing.Point(210, 50);
+            this.MNameTB.Margin = new System.Windows.Forms.Padding(5);
+            this.MNameTB.Name = "MNameTB";
+            this.MNameTB.Size = new System.Drawing.Size(175, 21);
+            this.MNameTB.TabIndex = 10;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(265, 141);
+            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 = 9;
+            this.btnCancel.Text = "取消";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnOK
+            // 
+            this.btnOK.Location = new System.Drawing.Point(92, 141);
+            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 = 8;
+            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(90, 53);
+            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 = 6;
+            this.label1.Text = "物料名称:";
+            // 
+            // FrmMaterial
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(450, 300);
+            this.Controls.Add(this.MNameTB);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnOK);
+            this.Controls.Add(this.label1);
+            this.Name = "FrmMaterial";
+            this.Text = "物料类别";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+        }
+
+        #endregion
+
+        private TextBox MNameTB;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnOK;
+        private Label label1;
+    }
+}

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

@@ -0,0 +1,74 @@
+using System;
+using System.Windows.Forms;
+using Mesnac.Action.ChemicalWeighing.Entity;
+
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+    public partial class FrmMaterial : Form
+    {
+        private MaterialInfoType _materialInfoType;
+        
+        private ActionType _actionType = ActionType.Add;    //操作类型，0-为添加，1-为修改
+        public FrmMaterial(ActionType actionType)
+        {
+            this._actionType = actionType;
+            InitializeComponent();
+        }
+
+        public FrmMaterial(ActionType actionType, MaterialInfoType materialInfoType):this(actionType)
+        {
+            _materialInfoType = materialInfoType;
+            this.MNameTB.Text = materialInfoType.MaterialInfoTypeName;
+        }
+        
+        
+
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            var materialinfoTypeName = MNameTB.Text.Trim();
+
+            if (string.IsNullOrEmpty(materialinfoTypeName))
+            {
+                MessageBox.Show("物料名不能为空！！");
+                this.MNameTB.Focus();
+                return;
+            }
+
+            var exist = MaterialInfoTypeHelp.Exist(materialinfoTypeName);
+            if (_actionType == ActionType.Add && exist>0)
+            {
+                MessageBox.Show("物料名已经存在！！");
+                this.MNameTB.Focus();
+                return;
+            }
+
+            if (_actionType == ActionType.Modify && exist>0)
+            {
+                MessageBox.Show("物料名已经存在！！");
+                this.MNameTB.Focus();
+                return;
+            }
+
+            if (_actionType == ActionType.Add)
+            {
+                MaterialInfoTypeHelp.Add(materialinfoTypeName);
+            }
+
+            if (_actionType == ActionType.Modify)
+            {
+                MaterialInfoTypeHelp.Update(_materialInfoType.Id,materialinfoTypeName);
+            }
+            
+           
+            
+            this.DialogResult = System.Windows.Forms.DialogResult.OK;
+            
+            
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.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/LjMaterial/InitDb.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Data;
+using System.Linq;
+using Mesnac.Action.Base;
+using Mesnac.Codd.Session;
+
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+    public class InitDbAction:ChemicalWeighingAction,IAction
+    {
+        
+        private DbMCControl _materialGridControl = null;      //物料列表控件
+        private RuntimeParameter _runtime;
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime); //必须调用
+            this._runtime = runtime;
+            
+        
+            InsertAction.OnInsertMaterial -= Process_Event;
+            InsertAction.OnInsertMaterial += Process_Event;
+
+            UpdateAction.OnUpdateMaterial -= Process_Event;
+            UpdateAction.OnUpdateMaterial += Process_Event;
+
+
+            DelAction.OnDelMaterial -= Process_Event;
+            DelAction.OnDelMaterial += Process_Event;
+            
+            DbMCControl  materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "MaterialInfoType").FirstOrDefault();         //获取物料数据控件
+            this._materialGridControl = materialGridControl;
+            FileControl();
+        }
+
+
+        private void FileControl()
+        {
+            DataTable table = MaterialInfoTypeHelp.GetTable("select id,MaterialTypeName,Remark from MaterialInfoType");
+            
+            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...");
+            }
+            
+        }
+        
+        
+        #region 事件处理方法
+
+        private void Process_Event(object sender, EventArgs e)
+        {
+            if (sender is RuntimeParameter)
+            {
+                this.Run(sender as RuntimeParameter);
+            }
+            else
+            {
+                this.Run(this._runtime);
+            }
+        }
+
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,48 @@
+using System;
+using System.Windows.Forms;
+using Mesnac.Action.Base;
+
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+    public class InsertAction:ChemicalWeighingAction,IAction
+    {
+        
+        /// <summary>
+        /// 新增物料事件定义
+        /// </summary>
+        public static event EventHandler OnInsertMaterial;
+        
+        private RuntimeParameter _runtime;
+        
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime); //必须调用
+            this._runtime = runtime;
+            DoWork();
+        }
+
+        private void DoWork()
+        {
+            this._runtime.BaseControl.MCEnabled = false;
+            
+            FrmMaterial frmInsertMaterial = new FrmMaterial(0);
+            frmInsertMaterial.ShowDialog(this._runtime.BaseControl.MCRoot as Control);
+            if (frmInsertMaterial.DialogResult == DialogResult.OK)
+            {
+                if (OnInsertMaterial != null)
+                {
+                    OnInsertMaterial(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty);
+                }
+                
+                frmInsertMaterial.Dispose();
+              
+            }
+            
+            this._runtime.BaseControl.MCEnabled = true;
+            
+           
+        }
+        
+        
+    }
+}

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

@@ -0,0 +1,8 @@
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+    public class MaterialInfoType
+    {
+        public int Id { get; set; }
+        public string MaterialInfoTypeName { get; set; }
+    }
+}

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

@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using FastReport.Data;
+using Mesnac.Codd.Session;
+
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+
+
+    public class DBHelp
+    {
+
+
+        public static DataTable GetTable(string sql)
+        {
+            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;
+            string strSql = sql;
+            dbHelper.CommandText = strSql;
+            DataTable table = dbHelper.ToDataTable();
+            return table;
+        }
+
+        public static DataTable GetTable(string sql, IDictionary<string, object> dic)
+        {
+            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;
+
+            string insertUserSql = sql;
+            dbHelper.CommandText = insertUserSql;
+            foreach (var keyValuePair in dic)
+            {
+                dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); 
+            }
+            DataTable table = dbHelper.ToDataTable();
+            return table;
+        }
+
+        public static void ExecuteNonQuery(string sql)
+        {
+            ExecuteNonQuery(sql,new Dictionary<string, object>());
+        }
+        public static void ExecuteNonQuery(string sql, IDictionary<string, object> dic)
+        {
+            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;
+
+            string insertUserSql = sql;
+            dbHelper.CommandText = insertUserSql;
+            foreach (var keyValuePair in dic)
+            {
+                dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); 
+            }
+            
+            dbHelper.ExecuteNonQuery();
+        } 
+        
+    }
+    
+    public class MaterialInfoTypeHelp:DBHelp
+    {
+
+
+        public static int Exist(string materialinfoTypeName)
+        {
+            string sql = "select  * from MaterialInfoType where MaterialTypeName=@mName";
+            IDictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("@mName",materialinfoTypeName);
+            var dataTable = GetTable(sql,dic);
+            return dataTable.Rows.Count;
+        }
+
+        public static void Add(string materialinfoTypeName)
+        {
+            string sql = @"INSERT INTO [MaterialInfoType] ( 
+            [MaterialTypeName] ,
+            [Remark] ) VALUES (@MaterialTypeName,'')";
+            
+            IDictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("@MaterialTypeName",materialinfoTypeName);
+
+            ExecuteNonQuery(sql,dic);
+
+        }
+        
+        
+        public static void Update(int id,string materialinfoTypeName)
+        {
+            string sql = @"update [MaterialInfoType] set 
+[MaterialTypeName] = @MaterialTypeName where id=@id";
+            
+            IDictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("@MaterialTypeName",materialinfoTypeName);
+            dic.Add("@id",id);
+
+            ExecuteNonQuery(sql,dic);
+
+        }
+
+        public static void Del(int id)
+        {
+            string sql = "delete from [MaterialInfoType] where  id="+id;
+            ExecuteNonQuery(sql);
+        }
+    }
+}

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

@@ -0,0 +1,78 @@
+using System;
+using System.Linq;
+using System.Windows.Forms;
+using ICSharpCode.Core;
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.Entity;
+using StringParser = DevExpress.Utils.Text.StringParser;
+
+namespace Mesnac.Action.ChemicalWeighing.LjMaterial
+{
+    public class UpdateAction:ChemicalWeighingAction,IAction
+    {
+        private DbMCControl _clientGridControl = null;      //用户列表控件
+        
+        /// <summary>
+        /// 新增物料事件定义
+        /// </summary>
+        public static event EventHandler OnUpdateMaterial;
+        
+        private RuntimeParameter _runtime;
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime); //必须调用
+            this._runtime = runtime;
+            DoWork();
+        }
+        
+        private void DoWork()
+        {
+            
+            
+            
+            DbMCControl clientGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "MaterialInfoType").FirstOrDefault();
+            
+            if (clientGridControl == null)
+            {
+                ICSharpCode.Core.LoggingService<UpdateAction>.Error("缺少物料信息列表控件...");
+                return;
+            }
+          
+            this._clientGridControl = clientGridControl;
+            DataGridView clientGridView = this._clientGridControl.BaseControl as DataGridView;
+
+           
+            //验证是否选中某物料
+            if (clientGridView.SelectedRows.Count != 1)
+            {
+                string msg1 = "请选择一项要修改的物料!";      //请选择一项要修改的物料!
+                MessageBox.Show(msg1, Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                this._runtime.IsReturn = true;
+                return;
+            }
+
+            int id =(int) clientGridView.SelectedRows[0].Cells[0].Value;
+            var name = clientGridView.SelectedRows[0].Cells[1].Value as string;
+            
+            this._runtime.BaseControl.MCEnabled = false;
+            FrmMaterial frmInsertMaterial = new FrmMaterial(ActionType.Modify,new MaterialInfoType()
+            {
+                Id = id,
+                MaterialInfoTypeName = name
+            });
+            frmInsertMaterial.ShowDialog(this._runtime.BaseControl.MCRoot as Control);
+            if (frmInsertMaterial.DialogResult == DialogResult.OK)
+            {
+                if (OnUpdateMaterial != null)
+                {
+                    OnUpdateMaterial(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty);
+                }
+                
+                frmInsertMaterial.Dispose();
+                this._runtime.BaseControl.MCEnabled = true;
+            }
+            
+           
+        }
+    }
+}

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

@@ -214,6 +214,18 @@
     <Compile Include="Entity\SimplePstUser.cs" />
     <Compile Include="FinishBatch\GHFinshBatchHelper.cs" />
     <Compile Include="FinishBatch\SCADAHelper\AlarmRefreshActionForExtend.cs" />
+    <Compile Include="LjMaterial\DelAction.cs" />
+    <Compile Include="LjMaterial\FrmMaterial.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LjMaterial\FrmMaterial.Designer.cs">
+      <DependentUpon>FrmMaterial.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LjMaterial\InitDb.cs" />
+    <Compile Include="LjMaterial\InsertAction.cs" />
+    <Compile Include="LjMaterial\MaterialInfoType.cs" />
+    <Compile Include="LjMaterial\MaterialInfoTypeHelp.cs" />
+    <Compile Include="LjMaterial\UpdateAction.cs" />
     <Compile Include="MaterialManage\BarcodeReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -221,12 +233,8 @@
       <DependentUpon>BarcodeReport.cs</DependentUpon>
     </Compile>
     <Compile Include="MaterialManage\DeleteMaterialAction.cs" />
-    <Compile Include="MaterialManage\FrmMaterial.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MaterialManage\FrmMaterial.designer.cs">
-      <DependentUpon>FrmMaterial.cs</DependentUpon>
-    </Compile>
+    <Compile Include="MaterialManage\FrmMaterial.cs" />
+    <Compile Include="MaterialManage\FrmMaterial.designer.cs" />
     <Compile Include="MaterialManage\InitMaterialFormAction.cs" />
     <Compile Include="MaterialManage\InsertMaterialAction.cs" />
     <Compile Include="MaterialManage\MaterialBarcodeAction.cs" />
@@ -443,12 +451,13 @@
     <EmbeddedResource Include="BinManage\FrmBin.resx">
       <DependentUpon>FrmBin.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="LjMaterial\FrmMaterial.resx">
+      <DependentUpon>FrmMaterial.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MaterialManage\BarcodeReport.resx">
       <DependentUpon>BarcodeReport.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MaterialManage\FrmMaterial.resx">
-      <DependentUpon>FrmMaterial.cs</DependentUpon>
-    </EmbeddedResource>
+    <EmbeddedResource Include="MaterialManage\FrmMaterial.resx" />
     <EmbeddedResource Include="Product\PptPlan\FrmBudget.resx">
       <DependentUpon>FrmBudget.cs</DependentUpon>
     </EmbeddedResource>

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

@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<ActionService>
+    <Design>
+        <Path path="榄菊物料管理">
+            <Action action="D153CA4EB9194493AD6990FB109E08C9">
+              <Caption>新增物料</Caption>
+              <Remark>新增物料</Remark>
+            </Action>
+            <Action action="FF53CA4EB9194493AD6990FB109E08A9">
+              <Caption>初始化物料</Caption>
+              <Remark>初始化物料</Remark>
+            </Action>
+            <Action action="C5E11538E9CB478BB486D54F041D0403">
+              <Caption>修改物料</Caption>
+              <Remark>修改物料</Remark>
+            </Action>
+            <Action action="25BB493710821F4279226FDCF3BA7A20">
+              <Caption>删除物料</Caption>
+              <Remark>删除物料</Remark>
+            </Action>
+<!--            <Action action="1EF0D5FF41014C898CC09FEF41838C5B">-->
+<!--              <Caption>条码预览</Caption>-->
+<!--              <Remark>条码预览</Remark>-->
+<!--            </Action>-->
+        </Path>
+    </Design>
+
+    <DesignToRuntime>
+        <Design action="FF53CA4EB9194493AD6990FB109E08A9">
+          <Runtime action="FF02BD4082D64340A51126E21C3CFAC5"/>
+        </Design>
+        <Design action="D153CA4EB9194493AD6990FB109E08C9">
+            <Runtime action="FF02BD4082D64340A51126E21C3CFCC5"/>
+        </Design>
+
+        <Design action="C5E11538E9CB478BB486D54F041D0403">
+            <Runtime action="FFE2BD4082D64340A51126E21C3CFCC5"/>
+        </Design>
+
+
+
+        <Design action="25BB493710821F4279226FDCF3BA7A20">
+            <Runtime action="1C516C48E101F7BDBC092E5272CBF0B9"/>
+        </Design>
+        
+    </DesignToRuntime>
+
+    <Runtime>
+        <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
+          <Action action="FF02BD4082D64340A51126E21C3CFAC5" class="Mesnac.Action.ChemicalWeighing.LjMaterial.InitDbAction"/>
+          <Action action="FF02BD4082D64340A51126E21C3CFCC5" class="Mesnac.Action.ChemicalWeighing.LjMaterial.InsertAction"/>
+          <Action action="FFE2BD4082D64340A51126E21C3CFCC5" class="Mesnac.Action.ChemicalWeighing.LjMaterial.UpdateAction"/>
+          <Action action="1C516C48E101F7BDBC092E5272CBF0B9" class="Mesnac.Action.ChemicalWeighing.LjMaterial.DelAction"/>
+            
+            
+<!--          <Action action="48E73E073B4E4836ABBDFF826E9E8534" class="Mesnac.Action.ChemicalWeighing.MaterialManage.MaterialBarcodeAction"/>-->
+        </Import>
+    </Runtime>
+</ActionService>

Main/MCEdit/Data/MCProject/SCWSProject2.mprj

@@ -26,6 +26,7 @@
       <Node Name="FormMachine" Text="干湿机器" ToolTipText="FormMachine" Tag="FormMachine" ImageIndex="3" SelectedImageIndex="3" />
       <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>
     <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/FormMaterialInfoType.xml

@@ -0,0 +1,165 @@
+
+  <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FormMaterialInfoType" 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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAgAAAFIAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAADQYFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYGAAAAAmlkBgcAAAAG5bqP5Y+3AQUAAAAEAAAABggAAAAQTWF0ZXJpYWxUeXBlTmFtZQYJAAAADOeJqeaWmeWQjeensAs=</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].[MaterialInfoType]</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">623, 314</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">
+      <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">229, 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="MCButton3" children="Controls">
+        <Property name="ClickActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDI1QkI0OTM3MTA4MjFGNDI3OTIyNkZEQ0YzQkE3QTIwBgYAAAAM5Yig6Zmk54mp5paZBgcAAAAM5Yig6Zmk54mp5paZCw==</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">155, 3</Property>
+        <Property name="Name">MCButton3</Property>
+        <Property name="Size">70, 40</Property>
+        <Property name="TabIndex">2</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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEM1RTExNTM4RTlDQjQ3OEJCNDg2RDU0RjA0MUQwNDAzBgYAAAAM5L+u5pS554mp5paZBgcAAAAM5L+u5pS554mp5paZCw==</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">81, 3</Property>
+        <Property name="Name">MCButton2</Property>
+        <Property name="Size">70, 40</Property>
+        <Property name="TabIndex">1</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton1" children="Controls">
+        <Property name="ClickActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQxNTNDQTRFQjkxOTQ0OTNBRDY5OTBGQjEwOUUwOEM5BgYAAAAM5paw5aKe54mp5paZBgcAAAAM5paw5aKe54mp5paZCw==</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">7, 3</Property>
+        <Property name="Name">MCButton1</Property>
+        <Property name="Size">70, 40</Property>
+        <Property name="TabIndex">0</Property>
+      </Object>
+      <Property name="Dock">Top</Property>
+      <Property name="Location">0, 0</Property>
+      <Property name="Name">Panel1</Property>
+      <Property name="Size">623, 48</Property>
+    </Object>
+    <Property name="LoadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEZGNTNDQTRFQjkxOTQ0OTNBRDY5OTBGQjEwOUUwOEE5BgYAAAAP5Yid5aeL5YyW54mp5paZBgcAAAAP5Yid5aeL5YyW54mp5paZCw==</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">639, 401</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">FormMaterialInfoType</Property>
+  </Object>

Main/MCEdit/MCEdit.csproj

@@ -191,6 +191,10 @@
       <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">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>