add - 完善自动代码

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs

@@ -4,10 +4,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
 {
     public class DeviceMaterrial
     {
+
         [Column(IsPrimary = true, IsIdentity = true)]
         public int Id { get; set; }
 
-
         /// <summary>
         /// 设备编号
         /// </summary>
@@ -25,6 +25,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
        
         public int Type { get; set; }
         
+        /// <summary>
+        /// 数据库code
+        /// </summary>
         public int Code { get; set; }
         
     }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/StockMaterrialDBHelp.cs

@@ -67,6 +67,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
             return dt;
         }
 
+
+
         /// <summary>
         /// 根据物料获取罐号
         /// </summary>

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs

@@ -39,11 +39,17 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity
         public IBaseControl WetDryWeight { get; set; }
         public IBaseControl WetMixTime { get; set; }
         public IBaseControl WetOutDelayTime { get; set; }
+        public IBaseControl ManualWeight { get; set; }
+        public IBaseControl ManualTolerance { get; set; }
 
         public Button WetManualControl { get; set; }
         public Button Download { get; set; }
         public Button LineStart { get; set; }
         public Button LineStop { get; set; }
+        public Button GelManualPowder { get; set; }
+        public Button GelManualColdWater { get; set; }
+        public Button GelManualHotWater { get; set; }
+        public Button WetManualGel { get; set; }
 
     }
 }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs

@@ -119,54 +119,44 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight");
             ControlsEntity.WetMixTime = GetBaseControl("WetMixTime");
             ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime");
+            ControlsEntity.ManualTolerance = GetBaseControl("ManualTolerance");
+            ControlsEntity.ManualWeight = GetBaseControl("ManualWeight");
 
             ControlsEntity.WetManualControl = GetButtonControl("WetManualControl");
             ControlsEntity.Download = GetButtonControl("Download");
             ControlsEntity.LineStart = GetButtonControl("LineStart");
             ControlsEntity.LineStop = GetButtonControl("LineStop");
+            ControlsEntity.GelManualPowder = GetButtonControl("GelManualPowder");
+            ControlsEntity.GelManualColdWater = GetButtonControl("GelManualColdWater");
+            ControlsEntity.GelManualHotWater = GetButtonControl("GelManualHotWater");
+            ControlsEntity.WetManualGel = GetButtonControl("WetManualGel");
         }
 
         private void BottomSelect(RuntimeParameter runtime)
         {
-            if(ControlsEntity.WetManualControl == runtime.Sender)
-            {
-                ManualAdd frm = new ManualAdd();
-                choose = SingleSelect();
-                DialogResult result = frm.ShowDialog();
-                this._runtime.BaseControl.MCEnabled = false;
-                if (result == DialogResult.OK)
-                {
-                    frm.Dispose();
-                }
-                this._runtime.BaseControl.MCEnabled = true;
-            }
+            
 
             if (ControlsEntity.Download == runtime.Sender)
             {
-
-                List<RecipePlcView> recipes = new List<RecipePlcView>();
+                if (MessageBox.Show("确认下传数据？", "下传确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
 
                 int bin1 = Convert.ToInt32(ControlsEntity.ChooseMaterial1.MCValue.ToString());
                 int bin2 = Convert.ToInt32(ControlsEntity.ChooseMaterial2.MCValue.ToString());
-                if(bin1 == -1)
-                {
-                    bin1 = 0;
-                }
-                if(bin2 == -1)
-                {
-                    bin2 = 0;
-                }
+                
+                List<RecipePlcView> recipes = new List<RecipePlcView>();
 
                 RecipePlcView recipe1 = new RecipePlcView()
                 {
-                    Bin = (ushort)bin1,
+                    Bin = (ushort)StockMaterrialDbHelp.GetCodeById(bin1),
                     Set = Convert.ToSingle(ControlsEntity.MaterialWeight1.MCValue.ToString()),
                     Tolerance = Convert.ToSingle(ControlsEntity.MaterialTolerance1.MCValue.ToString()),
-
                 };
                 RecipePlcView recipe2 = new RecipePlcView()
                 {
-                    Bin = (ushort)bin2,
+                    Bin = (ushort)StockMaterrialDbHelp.GetCodeById(bin2),
                     Set = Convert.ToSingle(ControlsEntity.MaterialWeight2.MCValue.ToString()),
                     Tolerance = Convert.ToSingle(ControlsEntity.MaterialTolerance2.MCValue.ToString()),
                 };
@@ -258,39 +248,67 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 mixSteps.Add(mixStep4);
                 mixSteps.Add(mixStep5);
 
+                List<DeviceMaterrial> materials = new List<DeviceMaterrial>();
+
+                DeviceMaterrial deviceMaterial1 = new DeviceMaterrial()
+                {
+                    DeviceId = SingleSelect(),
+                    MaterrialId = bin1,
+                    Type = 2,
+                    Code = StockMaterrialDbHelp.GetCodeById(bin1)
+                };
+                DeviceMaterrial deviceMaterial2 = new DeviceMaterrial()
+                {
+                    DeviceId = SingleSelect(),
+                    MaterrialId = bin2,
+                    Type = 2,
+                    Code = StockMaterrialDbHelp.GetCodeById(bin2)
+                };
+
+                materials.Add(deviceMaterial1);
+                materials.Add(deviceMaterial2);
+
                 switch (SingleSelect())
                 {
                     case 1:
                         LjPlanningPlcHelp.DownG1Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM1Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     case 2:
                         LjPlanningPlcHelp.DownG2Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM2Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     case 3:
                         LjPlanningPlcHelp.DownG3Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM3Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     case 4:
                         LjPlanningPlcHelp.DownG4Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM4Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     case 5:
                         LjPlanningPlcHelp.DownG5Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM5Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     case 6:
                         LjPlanningPlcHelp.DownG6Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM6Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     case 7:
                         LjPlanningPlcHelp.DownG7Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM7Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     case 8:
                         LjPlanningPlcHelp.DownG8Recipe(recipes, steps);
                         LjPlanningPlcHelp.DownM8Recipe(mixSteps);
+                        DeviceMaterrialService.Save(materials);
                         break;
                     default:
                         MessageBox.Show("请选择一条产线！");
@@ -299,8 +317,103 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
             }
 
+            #region 手动控制
+
+            if (ControlsEntity.GelManualPowder == runtime.Sender)
+            {
+                if (MessageBox.Show("确认手动下粉料？", "下粉确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
+            }
+
+            if (ControlsEntity.GelManualColdWater == runtime.Sender)
+            {
+                if (MessageBox.Show("确认下冷水？", "下水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
+            }
+
+            if (ControlsEntity.GelManualHotWater == runtime.Sender)
+            {
+                if (MessageBox.Show("确认下热水？", "下水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
+            }
+
+            if (ControlsEntity.WetManualGel == runtime.Sender)
+            {
+                if (MessageBox.Show("确认下糊化料？", "下糊化料确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
+            }
+
+            if (ControlsEntity.WetManualControl == runtime.Sender)
+            {
+                if (MessageBox.Show("确认下传数据？", "下传确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
+                SetValue value = new SetValue()
+                {
+                    Value = Convert.ToSingle(ControlsEntity.ManualTolerance.MCValue.ToString()),
+                    Toterance = Convert.ToSingle(ControlsEntity.ManualWeight.MCValue.ToString())
+                };
+
+                switch (GelerWeterControl.choose)
+                {
+                    case 1:
+                        DB2105WriteHelper.WriteManScrewH1();
+                        DB2105WriteHelper.WriteSetValueH1(value);
+                        break;
+                    case 2:
+                        DB2105WriteHelper.WriteManScrewH2();
+                        DB2105WriteHelper.WriteSetValueH1(value);
+                        break;
+                    case 3:
+                        DB2105WriteHelper.WriteManScrewH3();
+                        DB2105WriteHelper.WriteSetValueH2(value);
+                        break;
+                    case 4:
+                        DB2105WriteHelper.WriteManScrewH4();
+                        DB2105WriteHelper.WriteSetValueH2(value);
+                        break;
+                    case 5:
+                        DB2105WriteHelper.WriteManScrewH5();
+                        DB2105WriteHelper.WriteSetValueH3(value);
+                        break;
+                    case 6:
+                        DB2105WriteHelper.WriteManScrewH6();
+                        DB2105WriteHelper.WriteSetValueH3(value);
+                        break;
+                    case 7:
+                        DB2105WriteHelper.WriteManScrewH7();
+                        DB2105WriteHelper.WriteSetValueH4(value);
+                        break;
+                    case 8:
+                        DB2105WriteHelper.WriteManScrewH8();
+                        DB2105WriteHelper.WriteSetValueH4(value);
+                        break;
+                    default:
+                        MessageBox.Show("当前未选择产线！");
+                        return;
+                }
+            }
+
+            #endregion
+
+            #region 自动启停
+
             if (ControlsEntity.LineStart == runtime.Sender)
             {
+                if (MessageBox.Show("确认启动生产？", "启动确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
+
                 switch (SingleSelect())
                 {
                     case 1:
@@ -365,7 +478,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                         MessageBox.Show("请选择一条产线！");
                         return;
                 }
+
+                MessageBox.Show("已经停止生产");
+
             }
+
+            #endregion
+
         }
 
         private IBaseControl GetBaseControl(string name)

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs

@@ -1,6 +1,8 @@
 using Mesnac.Action.Base;
 using Mesnac.Action.ChemicalWeighing.AutoControl.DB;
 using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
+using Mesnac.Action.ChemicalWeighing.LjPlanning;
+using Mesnac.Controls.Base;
 using Mesnac.Controls.Default;
 using Microsoft.Office.Interop.Excel;
 using System;
@@ -25,12 +27,114 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
             McControls = GetAllControls();
 
-            ControlsEntity.ChooseMaterial1 = McControls.First(x => x.Name == "ChooseMaterial1") as MCCombobox;
-            ControlsEntity.ChooseMaterial2 = McControls.First(x => x.Name == "ChooseMaterial2") as MCCombobox;
+            ControlImport();
 
+            ControlInitFromPLC();
+            
+        }
+
+        /// <summary>
+        /// 控件从Plc初始化
+        /// </summary>
+        private void ControlInitFromPLC()
+        {
+            //switch (SingleSelect())
+            //{
+            //    case 1:
+            //        LjPlanningPlcHelp.GetGelatG1.
+            //}
             ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
             ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
+        }
+
+        /// <summary>
+        /// 单选选择
+        /// </summary>
+        /// <returns>返回单选的产线号 如果未选择返回0</returns>
+        private int SingleSelect()
+        {
+            if (Convert.ToBoolean(ControlsEntity.Line1.MCValue) == true)
+            {
+                return 1;
+            }
+            else if (Convert.ToBoolean(ControlsEntity.Line2.MCValue) == true)
+            {
+                return 2;
+            }
+            else if (Convert.ToBoolean(ControlsEntity.Line3.MCValue) == true)
+            {
+                return 3;
+            }
+            else if (Convert.ToBoolean(ControlsEntity.Line4.MCValue) == true)
+            {
+                return 4;
+            }
+            else if (Convert.ToBoolean(ControlsEntity.Line5.MCValue) == true)
+            {
+                return 5;
+            }
+            else if (Convert.ToBoolean(ControlsEntity.Line6.MCValue) == true)
+            {
+                return 6;
+            }
+            else if (Convert.ToBoolean(ControlsEntity.Line7.MCValue) == true)
+            {
+                return 7;
+            }
+            else if (Convert.ToBoolean(ControlsEntity.Line8.MCValue) == true)
+            {
+                return 8;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// 控件导入
+        /// </summary>
+        private void ControlImport()
+        {
+            ControlsEntity.Line1 = GetBaseControl("Line1");
+            ControlsEntity.Line2 = GetBaseControl("Line2");
+            ControlsEntity.Line3 = GetBaseControl("Line3");
+            ControlsEntity.Line4 = GetBaseControl("Line4");
+            ControlsEntity.Line5 = GetBaseControl("Line5");
+            ControlsEntity.Line6 = GetBaseControl("Line6");
+            ControlsEntity.Line7 = GetBaseControl("Line7");
+            ControlsEntity.Line8 = GetBaseControl("Line8");
 
+            ControlsEntity.ChooseMaterial1 = GetComboBoxControl("ChooseMaterial1");
+            ControlsEntity.ChooseMaterial2 = GetComboBoxControl("ChooseMaterial2");
+
+            ControlsEntity.MaterialWeight1 = GetBaseControl("MaterialWeight1");
+            ControlsEntity.MaterialWeight2 = GetBaseControl("MaterialWeight2");
+            ControlsEntity.MaterialTolerance1 = GetBaseControl("MaterialTolerance1");
+            ControlsEntity.MaterialTolerance2 = GetBaseControl("MaterialTolerance2");
+            ControlsEntity.GelSpeedSet = GetBaseControl("GelSpeedSet");
+            ControlsEntity.GelPosTimeA = GetBaseControl("GelPosTimeA");
+            ControlsEntity.GelNagTimeB = GetBaseControl("GelNagTimeB");
+            ControlsEntity.GelPosTimeC = GetBaseControl("GelPosTimeC");
+            ControlsEntity.GelWaterTime = GetBaseControl("GelWaterTime");
+            ControlsEntity.GelWaitTime = GetBaseControl("GelWaitTime");
+            ControlsEntity.GelCloseHeatTime = GetBaseControl("GelCloseHeatTime");
+            ControlsEntity.GelOutDelayTime = GetBaseControl("GelOutDelayTime");
+
+            ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight");
+            ControlsEntity.WetMixTime = GetBaseControl("WetMixTime");
+            ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime");
+
+        }
+
+        private IBaseControl GetBaseControl(string name)
+        {
+            return McControls.First(x => x.Name == name) as IBaseControl;
+        }
+
+        private MCCombobox GetComboBoxControl(string name)
+        {
+            return McControls.First(x => x.Name == name) as MCCombobox;
         }
     }
 }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.Designer.cs

@@ -1,105 +0,0 @@
-namespace Mesnac.Action.ChemicalWeighing.AutoControl
-{
-    partial class ManualAdd
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.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.ManualWeight = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label2 = new System.Windows.Forms.Label();
-            this.ManualTolerance = new System.Windows.Forms.TextBox();
-            this.SuspendLayout();
-            // 
-            // ManualWeight
-            // 
-            this.ManualWeight.Location = new System.Drawing.Point(118, 50);
-            this.ManualWeight.Name = "ManualWeight";
-            this.ManualWeight.Size = new System.Drawing.Size(121, 25);
-            this.ManualWeight.TabIndex = 0;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(60, 54);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(52, 15);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "重量：";
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(63, 147);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(176, 51);
-            this.button1.TabIndex = 2;
-            this.button1.Text = "确认";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(60, 85);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(52, 15);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "公差：";
-            // 
-            // ManualTolerance
-            // 
-            this.ManualTolerance.Location = new System.Drawing.Point(118, 81);
-            this.ManualTolerance.Name = "ManualTolerance";
-            this.ManualTolerance.Size = new System.Drawing.Size(121, 25);
-            this.ManualTolerance.TabIndex = 3;
-            // 
-            // ManualAdd
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(312, 236);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.ManualTolerance);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.ManualWeight);
-            this.Name = "ManualAdd";
-            this.Text = "手动加粉";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox ManualWeight;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TextBox ManualTolerance;
-    }
-}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.cs

@@ -1,70 +0,0 @@
-using DataBlockHelper.DBHelpers;
-using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Mesnac.Action.ChemicalWeighing.AutoControl
-{
-    public partial class ManualAdd : Form
-    {
-        public ManualAdd()
-        {
-            InitializeComponent();
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            SetValue value = new SetValue()
-            {
-                Value = Convert.ToSingle(ManualTolerance.Text),
-                Toterance = Convert.ToSingle(ManualWeight.Text)
-            };
-
-            switch (GelerWeterControl.choose)
-            {
-                case 1:
-                    DB2105WriteHelper.WriteManScrewH1();
-                    DB2105WriteHelper.WriteSetValueH1(value);
-                    break;
-                case 2:
-                    DB2105WriteHelper.WriteManScrewH2();
-                    DB2105WriteHelper.WriteSetValueH1(value);
-                    break;
-                case 3:
-                    DB2105WriteHelper.WriteManScrewH3();
-                    DB2105WriteHelper.WriteSetValueH2(value);
-                    break;
-                case 4:
-                    DB2105WriteHelper.WriteManScrewH4();
-                    DB2105WriteHelper.WriteSetValueH2(value);
-                    break;
-                case 5:
-                    DB2105WriteHelper.WriteManScrewH5();
-                    DB2105WriteHelper.WriteSetValueH3(value);
-                    break;
-                case 6:
-                    DB2105WriteHelper.WriteManScrewH6();
-                    DB2105WriteHelper.WriteSetValueH3(value);
-                    break;
-                case 7:
-                    DB2105WriteHelper.WriteManScrewH7();
-                    DB2105WriteHelper.WriteSetValueH4(value);
-                    break;
-                case 8:
-                    DB2105WriteHelper.WriteManScrewH8();
-                    DB2105WriteHelper.WriteSetValueH4(value);
-                    break;
-                default:
-                    MessageBox.Show("当前未选择产线！");
-                    return;
-            }
-        }
-    }
-}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ManualAdd.resx

@@ -1,120 +0,0 @@
-<?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/LjPlanning/LjPlanningPlcHelp.cs

@@ -461,7 +461,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
         public static DryerView GetGelatG6 => GetGelatView(1718);
         public static DryerView GetGelatG7 => GetGelatView(1858);
         public static DryerView GetGelatG8 => GetGelatView(1998);
-
         
         public static List<MixStep> GetWeterM1 = GetWeterView(2138);
         public static List<MixStep> GetWeterM2 = GetWeterView(2338);

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

@@ -227,12 +227,6 @@
     <Compile Include="AutoControl\Entity\GelerWeterControlsEntity.cs" />
     <Compile Include="AutoControl\GelerWeterControl.cs" />
     <Compile Include="AutoControl\InitAction.cs" />
-    <Compile Include="AutoControl\ManualAdd.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AutoControl\ManualAdd.Designer.cs">
-      <DependentUpon>ManualAdd.cs</DependentUpon>
-    </Compile>
     <Compile Include="BaseDataHelper.cs" />
     <Compile Include="BasePlcHelper.cs" />
     <Compile Include="Basic\BasicHelper.cs" />
@@ -731,9 +725,6 @@
     <EmbeddedResource Include="Alarm\PmtAlarm\FrmInsert.resx">
       <DependentUpon>FrmInsert.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="AutoControl\ManualAdd.resx">
-      <DependentUpon>ManualAdd.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="BinManage\FrmBin.resx">
       <DependentUpon>FrmBin.cs</DependentUpon>
     </EmbeddedResource>

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

@@ -1,9 +1,84 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AutoControlC" children="Controls">
+    <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LineStop" children="Controls">
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
+      <Property name="MCVisible">True</Property>
+      <Property name="MCEnabled">True</Property>
+      <Property name="MCPurview">False</Property>
+      <Property name="Format" />
+      <Property name="TextName" />
+      <Property name="NewFillColor">Red</Property>
+      <Property name="OldFillColor">DarkGray</Property>
+      <Property name="Text">停止</Property>
+      <Property name="Font">宋体, 12pt</Property>
+      <Property name="Location">733, 500</Property>
+      <Property name="Name">LineStop</Property>
+      <Property name="Size">168, 56</Property>
+      <Property name="TabIndex">7</Property>
+    </Object>
+    <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LineStart" children="Controls">
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
+      <Property name="MCVisible">True</Property>
+      <Property name="MCEnabled">True</Property>
+      <Property name="MCPurview">False</Property>
+      <Property name="Format" />
+      <Property name="TextName" />
+      <Property name="NewFillColor">Red</Property>
+      <Property name="OldFillColor">DarkGray</Property>
+      <Property name="Text">开始</Property>
+      <Property name="Font">宋体, 12pt</Property>
+      <Property name="Location">733, 438</Property>
+      <Property name="Name">LineStart</Property>
+      <Property name="Size">168, 56</Property>
+      <Property name="TabIndex">6</Property>
+    </Object>
+    <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Download" children="Controls">
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
+      <Property name="MCVisible">True</Property>
+      <Property name="MCEnabled">True</Property>
+      <Property name="MCPurview">False</Property>
+      <Property name="Format" />
+      <Property name="TextName" />
+      <Property name="NewFillColor">Red</Property>
+      <Property name="OldFillColor">DarkGray</Property>
+      <Property name="Text">下传</Property>
+      <Property name="Font">宋体, 12pt</Property>
+      <Property name="Location">733, 79</Property>
+      <Property name="Name">Download</Property>
+      <Property name="Size">168, 56</Property>
+      <Property name="TabIndex">8</Property>
+    </Object>
     <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox34" children="Controls">
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line4" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -24,7 +99,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line8" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -45,7 +120,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line7" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -66,7 +141,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line3" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -87,7 +162,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line6" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -108,7 +183,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line5" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -129,7 +204,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line2" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -150,7 +225,7 @@
       </Object>
       <Object type="Mesnac.Controls.Default.MCRadioButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Line1" children="Controls">
         <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNTZDMEI3QkNFNDRBRTY4MzUyMjFDQUEzRTExMzBFBgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw==</Binary>
         </Property>
         <Property name="IsChecked">False</Property>
         <Property name="MCKey" />
@@ -178,57 +253,54 @@
       <Property name="TabIndex">10</Property>
     </Object>
     <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox1" children="Controls">
-      <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Download" children="Controls">
-        <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="MCPurview">False</Property>
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="Text">下传</Property>
-        <Property name="Location">508, 347</Property>
-        <Property name="Name">Download</Property>
-        <Property name="Size">201, 56</Property>
-        <Property name="TabIndex">8</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LineStop" children="Controls">
-        <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="MCPurview">False</Property>
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="Text">停止</Property>
-        <Property name="Location">614, 415</Property>
-        <Property name="Name">LineStop</Property>
-        <Property name="Size">95, 56</Property>
-        <Property name="TabIndex">7</Property>
-      </Object>
       <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox28" children="Controls">
-        <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox46" children="Controls">
-          <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetOutDelayTime" children="Controls">
+        <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox48" children="Controls">
+          <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetManualGel" children="Controls">
+            <Property name="ClickActionList">
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAJAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
+            <Property name="MCVisible">True</Property>
+            <Property name="MCEnabled">True</Property>
+            <Property name="MCPurview">False</Property>
+            <Property name="Format" />
+            <Property name="TextName" />
+            <Property name="NewFillColor">Red</Property>
+            <Property name="OldFillColor">DarkGray</Property>
+            <Property name="Text">调糊化料</Property>
+            <Property name="Font">宋体, 12pt</Property>
+            <Property name="Location">18, 131</Property>
+            <Property name="Name">WetManualGel</Property>
+            <Property name="Size">153, 36</Property>
+            <Property name="TabIndex">51</Property>
+          </Object>
+          <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel54" 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="Font">宋体, 9pt</Property>
+            <Property name="Location">14, 48</Property>
+            <Property name="Name">MCLabel54</Property>
+            <Property name="Size">29, 12</Property>
+          </Object>
+          <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="ManualWeight" children="Controls">
             <Property name="KeyDownActionList">
               <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
             </Property>
@@ -247,11 +319,11 @@
             <Property name="MCEnabled">True</Property>
             <Property name="TextName" />
             <Property name="Location">73, 20</Property>
-            <Property name="Name">WetOutDelayTime</Property>
-            <Property name="Size">100, 21</Property>
-            <Property name="TabIndex">27</Property>
+            <Property name="Name">ManualWeight</Property>
+            <Property name="Size">80, 21</Property>
+            <Property name="TabIndex">47</Property>
           </Object>
-          <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel62" children="Controls">
+          <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel53" children="Controls">
             <Property name="Format" />
             <Property name="TextName" />
             <Property name="NewFillColor">Red</Property>
@@ -265,24 +337,15 @@
             <Property name="DbOptionType">None</Property>
             <Property name="MCVisible">True</Property>
             <Property name="MCEnabled">True</Property>
-            <Property name="Text">排料延时</Property>
+            <Property name="Text">重量</Property>
             <Property name="Font">宋体, 9pt</Property>
-            <Property name="Location">14, 24</Property>
-            <Property name="Name">MCLabel62</Property>
-            <Property name="Size">53, 12</Property>
+            <Property name="Location">14, 22</Property>
+            <Property name="Name">MCLabel53</Property>
+            <Property name="Size">29, 12</Property>
           </Object>
-          <Property name="TabStop">False</Property>
-          <Property name="Text">5-时间设定</Property>
-          <Property name="Font">宋体, 9pt</Property>
-          <Property name="Location">6, 255</Property>
-          <Property name="Name">GroupBox46</Property>
-          <Property name="Size">188, 56</Property>
-          <Property name="TabIndex">7</Property>
-        </Object>
-        <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox45" children="Controls">
           <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetManualControl" children="Controls">
             <Property name="ClickActionList">
-              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</Binary>
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAJAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</Binary>
             </Property>
             <Property name="MCKey" />
             <Property name="MCDataSourceID" />
@@ -299,17 +362,102 @@
             <Property name="NewFillColor">Red</Property>
             <Property name="OldFillColor">DarkGray</Property>
             <Property name="Text">手动加料</Property>
-            <Property name="Location">6, 20</Property>
+            <Property name="Font">宋体, 12pt</Property>
+            <Property name="Location">18, 83</Property>
             <Property name="Name">WetManualControl</Property>
-            <Property name="Size">176, 45</Property>
+            <Property name="Size">153, 34</Property>
             <Property name="TabIndex">23</Property>
           </Object>
+          <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="ManualTolerance" children="Controls">
+            <Property name="KeyDownActionList">
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+            </Property>
+            <Property name="WaterMarkText" />
+            <Property name="MaxValue">0</Property>
+            <Property name="MinValue">0</Property>
+            <Property name="IsEmpty">True</Property>
+            <Property name="MCKey" />
+            <Property name="MCDataSourceID" />
+            <Property name="IsDbControl">False</Property>
+            <Property name="InitDataSource" />
+            <Property name="ActionDataSource" />
+            <Property name="BindDataSource" />
+            <Property name="DbOptionType">Query</Property>
+            <Property name="MCVisible">True</Property>
+            <Property name="MCEnabled">True</Property>
+            <Property name="TextName" />
+            <Property name="Location">73, 47</Property>
+            <Property name="Name">ManualTolerance</Property>
+            <Property name="Size">80, 21</Property>
+            <Property name="TabIndex">48</Property>
+          </Object>
+          <Property name="TabStop">False</Property>
+          <Property name="Text">手动控制</Property>
+          <Property name="Font">宋体, 9pt</Property>
+          <Property name="Location">8, 266</Property>
+          <Property name="Name">GroupBox48</Property>
+          <Property name="Size">188, 174</Property>
+          <Property name="TabIndex">8</Property>
+        </Object>
+        <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox46" children="Controls">
+          <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetOutDelayTime" children="Controls">
+            <Property name="KeyDownActionList">
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+            </Property>
+            <Property name="WaterMarkText" />
+            <Property name="MaxValue">0</Property>
+            <Property name="MinValue">0</Property>
+            <Property name="IsEmpty">True</Property>
+            <Property name="MCKey" />
+            <Property name="MCDataSourceID" />
+            <Property name="IsDbControl">False</Property>
+            <Property name="InitDataSource" />
+            <Property name="ActionDataSource" />
+            <Property name="BindDataSource" />
+            <Property name="DbOptionType">Query</Property>
+            <Property name="MCVisible">True</Property>
+            <Property name="MCEnabled">True</Property>
+            <Property name="TextName" />
+            <Property name="Location">73, 20</Property>
+            <Property name="Name">WetOutDelayTime</Property>
+            <Property name="Size">100, 21</Property>
+            <Property name="TabIndex">27</Property>
+          </Object>
+          <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel62" 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="Font">宋体, 9pt</Property>
+            <Property name="Location">14, 24</Property>
+            <Property name="Name">MCLabel62</Property>
+            <Property name="Size">53, 12</Property>
+          </Object>
+          <Property name="TabStop">False</Property>
+          <Property name="Text">5-时间设定</Property>
+          <Property name="Font">宋体, 9pt</Property>
+          <Property name="Location">8, 204</Property>
+          <Property name="Name">GroupBox46</Property>
+          <Property name="Size">188, 56</Property>
+          <Property name="TabIndex">7</Property>
+        </Object>
+        <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox45" children="Controls">
           <Property name="TabStop">False</Property>
           <Property name="Text">4-等待</Property>
           <Property name="Font">宋体, 9pt</Property>
           <Property name="Location">6, 177</Property>
           <Property name="Name">GroupBox45</Property>
-          <Property name="Size">188, 72</Property>
+          <Property name="Size">188, 21</Property>
           <Property name="TabIndex">4</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox44" children="Controls">
@@ -430,34 +578,122 @@
         <Property name="Font">宋体, 12pt</Property>
         <Property name="Location">508, 25</Property>
         <Property name="Name">GroupBox28</Property>
-        <Property name="Size">202, 316</Property>
+        <Property name="Size">202, 446</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="LineStart" children="Controls">
-        <Property name="ClickActionList">
-          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="MCPurview">False</Property>
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="Text">开始</Property>
-        <Property name="Location">508, 415</Property>
-        <Property name="Name">LineStart</Property>
-        <Property name="Size">95, 56</Property>
-        <Property name="TabIndex">6</Property>
-      </Object>
       <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox29" children="Controls">
+        <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox47" children="Controls">
+          <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="GelManualPowder" children="Controls">
+            <Property name="ClickActionList">
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</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">False</Property>
+            <Property name="Format">
+            </Property>
+            <Property name="TextName" />
+            <Property name="NewFillColor">Red</Property>
+            <Property name="OldFillColor">DarkGray</Property>
+            <Property name="Text">调粉料</Property>
+            <Property name="Font">宋体, 12pt</Property>
+            <Property name="Location">6, 20</Property>
+            <Property name="Name">GelManualPowder</Property>
+            <Property name="Size">110, 43</Property>
+            <Property name="TabIndex">43</Property>
+          </Object>
+          <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="GelManualHotWater" children="Controls">
+            <Property name="ClickActionList">
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</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">False</Property>
+            <Property name="Format">
+            </Property>
+            <Property name="TextName" />
+            <Property name="NewFillColor">Red</Property>
+            <Property name="OldFillColor">DarkGray</Property>
+            <Property name="Text">下热水</Property>
+            <Property name="Font">宋体, 12pt</Property>
+            <Property name="Location">6, 183</Property>
+            <Property name="Name">GelManualHotWater</Property>
+            <Property name="Size">110, 43</Property>
+            <Property name="TabIndex">45</Property>
+          </Object>
+          <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="GelManualColdWater" children="Controls">
+            <Property name="ClickActionList">
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</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">False</Property>
+            <Property name="Format">
+            </Property>
+            <Property name="TextName" />
+            <Property name="NewFillColor">Red</Property>
+            <Property name="OldFillColor">DarkGray</Property>
+            <Property name="Text">下冷水</Property>
+            <Property name="Font">宋体, 12pt</Property>
+            <Property name="Location">6, 100</Property>
+            <Property name="Name">GelManualColdWater</Property>
+            <Property name="Size">110, 43</Property>
+            <Property name="TabIndex">44</Property>
+          </Object>
+          <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton2147483643" children="Controls">
+            <Property name="ClickActionList">
+              <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAJAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw==</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">Query</Property>
+            <Property name="MCVisible">True</Property>
+            <Property name="MCEnabled">True</Property>
+            <Property name="MCPurview">False</Property>
+            <Property name="Format" />
+            <Property name="TextName" />
+            <Property name="NewFillColor">Red</Property>
+            <Property name="OldFillColor">DarkGray</Property>
+            <Property name="Text">手动加料</Property>
+            <Property name="Font">宋体, 12pt</Property>
+            <Property name="Location">151, 136</Property>
+            <Property name="Name">MCButton2147483643</Property>
+            <Property name="Size">176, 47</Property>
+            <Property name="TabIndex">23</Property>
+          </Object>
+          <Property name="TabStop">False</Property>
+          <Property name="Text">手动控制</Property>
+          <Property name="Font">宋体, 9pt</Property>
+          <Property name="Location">365, 207</Property>
+          <Property name="Name">GroupBox47</Property>
+          <Property name="Size">122, 232</Property>
+          <Property name="TabIndex">46</Property>
+        </Object>
         <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MaterialTolerance2" children="Controls">
           <Property name="KeyDownActionList">
             <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@@ -640,7 +876,7 @@
           <Property name="Font">宋体, 9pt</Property>
           <Property name="Location">6, 319</Property>
           <Property name="Name">GroupBox41</Property>
-          <Property name="Size">481, 55</Property>
+          <Property name="Size">353, 55</Property>
           <Property name="TabIndex">7</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox40" children="Controls">
@@ -649,7 +885,7 @@
           <Property name="Font">宋体, 9pt</Property>
           <Property name="Location">6, 292</Property>
           <Property name="Name">GroupBox40</Property>
-          <Property name="Size">481, 21</Property>
+          <Property name="Size">353, 21</Property>
           <Property name="TabIndex">3</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox30" children="Controls">
@@ -744,7 +980,7 @@
           <Property name="Font">宋体, 9pt</Property>
           <Property name="Location">6, 380</Property>
           <Property name="Name">GroupBox30</Property>
-          <Property name="Size">481, 59</Property>
+          <Property name="Size">353, 59</Property>
           <Property name="TabIndex">10</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox39" children="Controls">
@@ -796,7 +1032,7 @@
           <Property name="Font">宋体, 9pt</Property>
           <Property name="Location">6, 231</Property>
           <Property name="Name">GroupBox39</Property>
-          <Property name="Size">484, 55</Property>
+          <Property name="Size">353, 55</Property>
           <Property name="TabIndex">3</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox38" children="Controls">
@@ -805,7 +1041,7 @@
           <Property name="Font">宋体, 9pt</Property>
           <Property name="Location">6, 204</Property>
           <Property name="Name">GroupBox38</Property>
-          <Property name="Size">481, 21</Property>
+          <Property name="Size">353, 21</Property>
           <Property name="TabIndex">2</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox37" children="Controls">
@@ -1172,7 +1408,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">930, 606</Property>
+    <Property name="Size">928, 607</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">湿混糊化自动参数控制</Property>
     <Property name="WindowState">Normal</Property>