diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Entity/Report/Report_WetMixer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Entity/Report/Report_WetMixer.cs
new file mode 100644
index 0000000..6302610
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Entity/Report/Report_WetMixer.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.Entity.Report
+{
+    /// <summary>
+    /// 干混机报表
+    /// </summary>
+    public class Report_WetMixer
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="id"></param>
+        public Report_WetMixer(Guid id = default)
+        {
+            report_Id = id == default ? Guid.NewGuid() : id;
+        }
+
+        /// <summary>
+        /// 报表Id
+        /// </summary>
+        public Guid report_Id { get; set; }
+
+        /// <summary>
+        /// Dos
+        /// </summary>
+        public List<WetMixer> wetmixer { get; set; }
+
+        /// <summary>
+        /// Mix
+        /// </summary>
+        public List<WetMixerMix> mix { get; set; }
+    }
+
+    public class WetMixer
+    {
+        /// <summary>
+        /// 设备编号 
+        /// </summary>
+        public int eqNo { get; set; }
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+        public string recordTime { get; set; }
+    }
+
+    public class WetMixerMix
+    {
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public int eqNo { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public int mixBatch { get; set; }
+        /// <summary>
+        /// 步号
+        /// </summary>
+        public int mixStep { get; set; }
+        /// <summary>
+        /// 动作
+        /// </summary>
+        public int actCode { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public int mixTime { get; set; }
+        /// <summary>
+        /// 温度
+        /// </summary>
+        public double mixTemp { get; set; }
+        /// <summary>
+        /// 速度
+        /// </summary>
+        public double mixSpeed { get; set; }
+        /// <summary>
+        /// 混合机编号
+        /// </summary>
+        public int mix { get; set; }
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+        public string recordTime { get; set; }
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs
index f01e98a..1c27a6b 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs
@@ -467,17 +467,17 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
                     }
                     catch (Exception ex)
                     {
-                        ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("物料称量存盘异常：{1}", ex.Message), ex);
+                        ICSharpCode.Core.LoggingService<FinishBatchHelper>.Error(String.Format("物料称量存盘异常：{1}", ex.Message), ex);
                     }
                     #endregion
 
                     //存盘数据保存完成，写入反馈信号
-                    ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Debug("数据存盘_PLC物料数据写入数据库处理完毕!");
+                    ICSharpCode.Core.LoggingService<FinishBatchHelper>.Debug("数据存盘_PLC物料数据写入数据库处理完毕!");
                     bool result = BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.ChemicalWeighing_PC_RpSaved, new object[] { 1 });
 
                     if (!result)
                     {
-                        ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Debug("数据存盘后写入反馈信号失败!");
+                        ICSharpCode.Core.LoggingService<FinishBatchHelper>.Debug("数据存盘后写入反馈信号失败!");
                     }
                     //将车次与计划表中的数量比对，更新计划数量中的完成数量
                     if (recordSaveDataInfo.PlanId != "")
@@ -508,7 +508,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
             }
             catch (Exception ex)
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("生产数据存盘异常：{1}", ex.Message), ex);
+                ICSharpCode.Core.LoggingService<FinishBatchHelper>.Error(String.Format("生产数据存盘异常：{1}", ex.Message), ex);
             }
         }
         #endregion
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
index ee5cfb0..5d93bf8 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
@@ -159,7 +159,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
             }
             catch (Exception ex)
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("AlarmSaveHelper逻辑异常：{0}", ex.Message), ex);
+                ICSharpCode.Core.LoggingService<AlarmSaveHelper>.Error(String.Format("AlarmSaveHelper逻辑异常：{0}", ex.Message), ex);
             }
         }
 
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportSaveHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportSaveHelper.cs
index 1d5b934..6a387eb 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportSaveHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportSaveHelper.cs
@@ -1,15 +1,8 @@
-using DevExpress.DataAccess.Native.Json;
-using DevExpress.Office.Utils;
-using DevExpress.XtraPrinting.Native.WebClientUIControl;
-using Mesnac.Action.ChemicalWeighing.Entity.Report;
+using Mesnac.Action.ChemicalWeighing.Entity.Report;
 using Mesnac.Codd.Session;
-using Mesnac.PlcUtils;
-using Microsoft.Office.Interop.Excel;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Web.Script.Serialization;
 
@@ -36,7 +29,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
         {
             try
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Debug("干混机报表数据保存开始！！！");
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Debug("干混机报表数据保存开始！！！");
                 //准备信号读取
                 //if (BasePlcHelper.Instance.RdyRpt_D1.NowValue.ToInt() == 1)
                 //{
@@ -66,7 +59,31 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
             }
             catch (Exception ex)
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("干混机报表数据保存异常：{0}", ex.Message), ex);
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("干混机报表数据保存异常：{0}", ex.Message), ex);
+            }
+        }
+
+        /// <summary>
+        /// 湿混机报表数据保存
+        /// </summary>
+        public void SaveWetMixerReport()
+        {
+            try
+            {
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Debug("湿混机报表数据保存开始！！！");
+
+
+                //准备信号读取
+
+
+                Report_WetMixer WetMixer_dos0 = readWetMixer("A"); //读取报表数据
+                SaveReportDb(WetMixer_dos0); //保存报表数据
+
+
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("湿混机报表数据保存异常：{0}", ex.Message), ex);
             }
         }
 
@@ -87,12 +104,33 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
             }
             catch (Exception ex)
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("通过PLC读取干混机报表数读取异常：{0}", ex.Message), ex);
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("通过PLC读取干混机报表数读取异常：{0}", ex.Message), ex);
             }
             return _dryMixer;
         }
 
-        
+        /// <summary>
+        /// 通过PLC读取湿混机报表数据
+        /// </summary>
+        /// <param name="machineType">湿混机A、湿混机B</param>
+        /// <returns></returns>
+        private Report_WetMixer readWetMixer(string machineType)
+        {
+            Report_WetMixer _wetMixer = null;
+            try
+            {
+                _wetMixer = new Report_WetMixer();
+                _wetMixer.wetmixer = readWetMixers(machineType, 4);
+                _wetMixer.mix = readWetMixerMix(machineType, 10);
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("通过PLC读取湿混机报表数读取异常：{0}", ex.Message), ex);
+            }
+            return _wetMixer;
+        }
+
+
         /// <summary>
         /// 读取干混机Dos数据
         /// </summary>
@@ -170,7 +208,73 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
         }
 
         /// <summary>
-        /// 保存报表数据至数据库
+        /// 读取湿混机数据
+        /// </summary>
+        /// <param name="machineType"></param>
+        /// <param name="amount"></param>
+        /// <returns></returns>
+        private List<WetMixer> readWetMixers(string machineType, int amount)
+        {
+            List<WetMixer> wetMixers = new List<WetMixer>();
+            for (int mixer = 0; mixer < 10; mixer++)
+            {
+
+                #region 实例化参数
+                BasePlcHelper.Instance.dryer_eqNo = new Entity.DataKeyValue($"wetMixing{machineType}_{mixer}_eqNo");
+                
+                #endregion
+
+                WetMixer wetMixer = new WetMixer()
+                {
+                    eqNo = BasePlcHelper.Instance.dryer_eqNo.NowValue.ToInt(),
+                    recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                };
+                wetMixers.Add(wetMixer);
+            }
+
+            return wetMixers;
+        }
+
+        /// <summary>
+        /// 读取湿混机Mix数据
+        /// </summary>
+        /// <param name="machineType"></param>
+        /// <param name="amount"></param>
+        /// <returns></returns>
+        private List<WetMixerMix> readWetMixerMix(string machineType, int amount)
+        {
+            List<WetMixerMix> wetMixerMixes = new List<WetMixerMix>();
+            for (int mix = 0; mix < 10; mix++)
+            {
+                #region 实例化参数
+                BasePlcHelper.Instance.dryer_mixBatch = new Entity.DataKeyValue($"wetMixing{machineType}_{mix}_mixBatch");
+                BasePlcHelper.Instance.dryer_mixStep = new Entity.DataKeyValue($"wetMixing{machineType}_{mix}_mixStep");
+                BasePlcHelper.Instance.dryer_actCode = new Entity.DataKeyValue($"wetMixing{machineType}_{mix}_actCode");
+                BasePlcHelper.Instance.dryer_mixTime = new Entity.DataKeyValue($"wetMixing{machineType}_{mix}_mixTime");
+                BasePlcHelper.Instance.dryer_mixTemp = new Entity.DataKeyValue($"wetMixing{machineType}_{mix}_mixTemp");
+                BasePlcHelper.Instance.dryer_mixSpeed = new Entity.DataKeyValue($"wetMixing{machineType}_{mix}_mixSpeed");
+                #endregion
+
+                WetMixerMix wetMixerMix = new WetMixerMix()
+                {
+                    eqNo = BasePlcHelper.Instance.dryer_eqNo.NowValue.ToInt(),
+                    mixBatch = BasePlcHelper.Instance.dryer_mixBatch.NowValue.ToInt(),
+                    mixStep = BasePlcHelper.Instance.dryer_matCode.NowValue.ToInt(),
+                    actCode = BasePlcHelper.Instance.dryer_actCode.NowValue.ToInt(),
+                    mixTime = BasePlcHelper.Instance.dryer_mixTime.NowValue.ToInt(),
+                    mixTemp = BasePlcHelper.Instance.dryer_mixTemp.NowValue.ToDouble(),
+                    mixSpeed = BasePlcHelper.Instance.dryer_mixSpeed.NowValue.ToDouble(),
+                    mix = mix,
+                    recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                };
+                wetMixerMixes.Add(wetMixerMix);
+            }
+
+            return wetMixerMixes;
+        }
+
+        /// <summary>
+        /// 保存干混机报表数据至数据库
         /// </summary>
         /// <param name="_dryMixer"></param>
         private void SaveReportDb(Report_DryMixer _dryMixer)
@@ -191,11 +295,42 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
                 }
 
 
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Warn($"报表数据打印：{str}");
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Warn($"报表数据打印：{str}");
             }
             catch (Exception ex)
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("保存报表数据至数据库异常：{0}", ex.Message), ex);
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("保存报表数据至数据库异常：{0}", ex.Message), ex);
+            }
+        }
+
+        /// <summary>
+        /// 保存湿混机报表数据至数据库
+        /// </summary>
+        /// <param name="_wetMixer"></param>
+        private void SaveReportDb(Report_WetMixer _wetMixer)
+        {
+            JavaScriptSerializer serializer = new JavaScriptSerializer();
+            try
+            {
+                string str = serializer.Serialize(_wetMixer);
+                if (_wetMixer != null)
+                {
+                    if (_wetMixer.wetmixer != null)
+                    {
+                        InsertReportWetMixer(_wetMixer.report_Id, _wetMixer.wetmixer);
+                    }
+                    else if (_wetMixer.mix != null)
+                    {
+                        InsertReportWetMixerDetail(_wetMixer.report_Id, _wetMixer.mix);
+                    }
+                }
+
+
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Warn($"报表数据打印：{str}");
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("保存报表数据至数据库异常：{0}", ex.Message), ex);
             }
         }
 
@@ -243,7 +378,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
                 });
             }catch (Exception ex)
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("保存干混机报表数据异常：{0}", ex.Message), ex);
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("保存干混机报表数据异常：{0}", ex.Message), ex);
             }
         }
 
@@ -288,7 +423,92 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
                 });
             }catch(Exception ex)
             {
-                ICSharpCode.Core.LoggingService<GHFinshBatchHelper>.Error(String.Format("保存干混机报表明细数据异常：{0}", ex.Message), ex);
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("保存干混机报表明细数据异常：{0}", ex.Message), ex);
+            }
+        }
+
+        /// <summary>
+        /// 保存湿混机报表数据
+        /// </summary>
+        /// <param name="reportId"></param>
+        /// <param name="_dryMixerDos"></param>
+        private void InsertReportWetMixer(Guid reportId, List<WetMixer> wetMixers)
+        {
+            try
+            {
+
+                Task.Run(() =>
+                {
+                    DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
+                    if (dbHelper == null)
+                    {
+                        throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError);
+                    }
+                    string sqlStr = @"insert into Report_WetMixer
+                                (reportId, eqNo)
+                            values
+                                (@reportId, @eqNo)";
+
+                    foreach (WetMixer _wetMixer in wetMixers)
+                    {
+                        dbHelper.ClearParameter();
+                        dbHelper.CommandType = CommandType.Text;
+                        dbHelper.CommandText = sqlStr;
+                        dbHelper.AddParameter("@eqNo", _wetMixer.eqNo);
+                        dbHelper.AddParameter("@reportId", reportId);
+                        dbHelper.ExecuteNonQuery();
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("保存湿混机报表数据异常：{0}", ex.Message), ex);
+            }
+        }
+
+        /// <summary>
+        /// 保存湿混机报表明细数据
+        /// </summary>
+        /// <param name="reportId"></param>
+        /// <param name="_dryMixerMix"></param>
+        private void InsertReportWetMixerDetail(Guid reportId, List<WetMixerMix> wetMixers)
+        {
+            try
+            {
+                Task.Run(() =>
+                {
+                    DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
+                    if (dbHelper == null)
+                    {
+                        throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError);
+                    }
+                    string sqlStr = @"insert into Report_WetMixer_Detail 
+                                    (reportId, eqNo, mixBatch, mixStep, actCode, mixTime, mixTemp, mixSpeed, mix)
+                                values 
+                                    (@reportId, @eqNo, @mixBatch, @mixStep, @actCode, @mixTime, @mixTemp, @mixSpeed, @mix)";
+                    foreach (WetMixerMix _wetMixerMix in wetMixers)
+                    {
+                        if (_wetMixerMix.actCode == 0) continue;
+
+                        dbHelper.ClearParameter();
+                        dbHelper.CommandType = CommandType.Text;
+                        dbHelper.CommandText = sqlStr;
+                        dbHelper.AddParameter("@reportId", reportId);
+                        dbHelper.AddParameter("@eqNo", _wetMixerMix.eqNo);
+                        dbHelper.AddParameter("@mixBatch", _wetMixerMix.mixBatch);
+                        dbHelper.AddParameter("@mixStep", _wetMixerMix.mixStep);
+                        dbHelper.AddParameter("@actCode", _wetMixerMix.actCode);
+                        dbHelper.AddParameter("@mixTime", _wetMixerMix.mixTime);
+                        dbHelper.AddParameter("@mixTemp", _wetMixerMix.mixTemp);
+                        dbHelper.AddParameter("@mixSpeed", _wetMixerMix.mixSpeed);
+                        dbHelper.AddParameter("@mix", _wetMixerMix.mix);
+                        dbHelper.ExecuteNonQuery();
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportSaveHelper>.Error(String.Format("保存湿混机报表明细数据异常：{0}", ex.Message), ex);
             }
         }
     }
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 4db16b5..652dc5b 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -215,6 +215,7 @@
     <Compile Include="Entity\RecordSaveDataInfo.cs" />
     <Compile Include="Entity\Report\LR_BarcodeLog.cs" />
     <Compile Include="Entity\Report\Report_DryMixer.cs" />
+    <Compile Include="Entity\Report\Report_WetMixer.cs" />
     <Compile Include="Entity\SimplePstRole.cs" />
     <Compile Include="Entity\SimplePstUser.cs" />
     <Compile Include="FinishBatch\GHFinshBatchHelper.cs" />
diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
index 87c9678..255e2aa 100644
--- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
+++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
@@ -43,6 +43,7 @@
       <Node Name="FormdeviceDetail" Text="设备细节" ToolTipText="FormdeviceDetail" Tag="FormdeviceDetail" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormDeviceDetail2" Text="设备细节2" ToolTipText="FormDeviceDetail2" Tag="FormDeviceDetail2" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="Report_DryMixer" Text="干混机报表" ToolTipText="Report_DryMixer" Tag="Report_DryMixer" ImageIndex="3" SelectedImageIndex="3" />
+      <Node Name="湿混机报表" Text="湿混机报表" ToolTipText="湿混机报表" Tag="湿混机报表" 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" />
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/Form1ys.xml b/Main/MCEdit/Data/MCProject/nodeForm/Form1ys.xml
new file mode 100644
index 0000000..7a86bcf
--- /dev/null
+++ b/Main/MCEdit/Data/MCProject/nodeForm/Form1ys.xml
@@ -0,0 +1,28 @@
+
+  <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Form1ys" children="Controls">
+    <Property name="LoadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</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">600, 401</Property>
+    <Property name="StartPosition">WindowsDefaultLocation</Property>
+    <Property name="Text">34</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">Form1ys</Property>
+  </Object>
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/湿混机报表.xml b/Main/MCEdit/Data/MCProject/nodeForm/湿混机报表.xml
new file mode 100644
index 0000000..10d2dc5
--- /dev/null
+++ b/Main/MCEdit/Data/MCProject/nodeForm/湿混机报表.xml
@@ -0,0 +1,311 @@
+
+  <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="湿混机报表" children="Controls">
+    <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox2" 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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACgAAAO0AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAA0GBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGDgAAAARlcU5vBg8AAAAG6K6+5aSHAQUAAAAEAAAABhAAAAADZG9zBhEAAAADRG9zAQYAAAAEAAAABhIAAAAFYmF0Y2gGEwAAAAnmibnmrKHlj7cBBwAAAAQAAAAGFAAAAAdtYXRDb2RlBhUAAAAM54mp5paZ5Luj56CBAQgAAAAEAAAABhYAAAAIc2V0VmFsdWUGFwAAAAzorr7lrprph43ph48BCQAAAAQAAAAGGAAAAAhzZXRUb2xlcgYZAAAADOiuvuWumuWFrOW3rgEKAAAABAAAAAYaAAAACGFjdFZhbHVlBhsAAAAM5a6e6ZmF6YeN6YePAQsAAAAEAAAABhwAAAAIYWN0VG9MZXIGHQAAAAzlrp7pmYXlhazlt64BDAAAAAQAAAAGHgAAAApyZWNvcmRUaW1lBh8AAAAM6K6w5b2V5pe26Ze0AQ0AAAAEAAAABiAAAAAIcmVwb3J0SWQGIQAAAAzmiqXooajnvJblj7cL</Binary>
+        </Property>
+        <Property name="ClickActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+        </Property>
+        <Property name="DoubleClickActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAANAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ2YTgwYzA3NTY0MzRmNWI5Mjc4MDQ0YmUzOGVlNTdmBgYAAAAM5oql6KGo5piO57uGBgcAAAAM5oql6KGo5piO57uGCw==</Binary>
+        </Property>
+        <Property name="SelectionChangedActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=</Binary>
+        </Property>
+        <Property name="MCKey">[DataSource1].[Report_DryMixer]</Property>
+        <Property name="MCDataSourceID">MCDataSource1</Property>
+        <Property name="IsDbControl">True</Property>
+        <Property name="InitDataSource">select t1.objId,t1.reportId,t2.Name as eqNo,t1.batch,t1.matCode,t1.setValue,t1.setToler,t1.actValue,t1.actToLer,t1.dos,t1.recordTime from Report_DryMixer t1 left join Device t2 on t1.eqNo = t2.Id</Property>
+        <Property name="ActionDataSource" />
+        <Property name="BindDataSource">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw==</Binary>
+        </Property>
+        <Property name="DbOptionType">Query</Property>
+        <Property name="MCVisible">True</Property>
+        <Property name="MCEnabled">True</Property>
+        <Property name="ColumnHeadersHeight">25</Property>
+        <Property name="MultiSelect">False</Property>
+        <Property name="Dock">Fill</Property>
+        <Property name="Location">3, 22</Property>
+        <Property name="Name">MCDataGridView1</Property>
+        <Property name="Size">1262, 335</Property>
+        <Property name="TabIndex">0</Property>
+      </Object>
+      <Property name="TabStop">False</Property>
+      <Property name="Text">报表数据</Property>
+      <Property name="Dock">Top</Property>
+      <Property name="Font">宋体, 12pt, style=Bold</Property>
+      <Property name="Location">0, 64</Property>
+      <Property name="Name">GroupBox2</Property>
+      <Property name="Size">1268, 360</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="GroupBox3" children="Controls">
+      <Object type="Mesnac.Controls.Default.MultiColHeaderDgv, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MultiColHeaderDgv1" children="Controls">
+        <Property name="Dock">Fill</Property>
+        <Property name="Location">3, 22</Property>
+        <Property name="Name">MultiColHeaderDgv1</Property>
+        <Property name="Size">1262, 685</Property>
+      </Object>
+      <Property name="TabStop">False</Property>
+      <Property name="Text">报表明细</Property>
+      <Property name="Dock">Fill</Property>
+      <Property name="Font">宋体, 12pt, style=Bold</Property>
+      <Property name="Location">0, 64</Property>
+      <Property name="Name">GroupBox3</Property>
+      <Property name="Size">1268, 710</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="GroupBox1" children="Controls">
+      <Object type="Mesnac.Controls.Default.MCCombobox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCCombobox1" children="Controls">
+        <Property name="AllowTypeAllSymbols">True</Property>
+        <Property name="ComboboxList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAQAAAAcAAAAHAwAAAAABAAAABAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAJBAAAAA0DBQQAAAAlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAIY21iVmFsdWUKY21iRGlzcGxheQEBAgAAAAYFAAAABuWFqOmDqAYGAAAABuWFqOmDqAs=</Binary>
+        </Property>
+        <Property name="IsEmpty">True</Property>
+        <Property name="DisplayFiled">Name</Property>
+        <Property name="ValueFiled">Id</Property>
+        <Property name="SelectedChanged">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+        </Property>
+        <Property name="MCKey">[DataSource1].[Device].[Id]</Property>
+        <Property name="MCDataSourceID">MCDataSource1</Property>
+        <Property name="IsDbControl">False</Property>
+        <Property name="InitDataSource">select * from Device where Name LIKE '干混%'</Property>
+        <Property name="ActionDataSource" />
+        <Property name="BindDataSource" />
+        <Property name="DbOptionType">Query</Property>
+        <Property name="MCVisible">True</Property>
+        <Property name="MCEnabled">True</Property>
+        <Property name="Location">779, 28</Property>
+        <Property name="Name">MCCombobox1</Property>
+        <Property name="Size">69, 24</Property>
+        <Property name="TabIndex">59</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel3" 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">宋体, 12pt</Property>
+        <Property name="Location">701, 31</Property>
+        <Property name="Name">MCLabel3</Property>
+        <Property name="Size">72, 16</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+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIGI3YzYyNDZlNzVhYzQ1NjNhZjk3Y2Y4ZjUwODk2ODk1BgYAAAAG5a+85Ye6BgcAAAAV5a+85Ye65bmy5re35py65oql6KGoCw==</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="Dock">Right</Property>
+        <Property name="Location">1019, 22</Property>
+        <Property name="Name">MCButton2</Property>
+        <Property name="Size">121, 39</Property>
+        <Property name="TabIndex">36</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCDateTimePicker, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDateTimePicker4" children="Controls">
+        <Property name="ValueChangedList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+        </Property>
+        <Property name="MCKey">endtime</Property>
+        <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="Format">Time</Property>
+        <Property name="ShowUpDown">True</Property>
+        <Property name="Location">551, 26</Property>
+        <Property name="Name">MCDateTimePicker4</Property>
+        <Property name="Size">117, 26</Property>
+        <Property name="TabIndex">29</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCDateTimePicker, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDateTimePicker3" children="Controls">
+        <Property name="ValueChangedList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+        </Property>
+        <Property name="MCKey">starttime</Property>
+        <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="Format">Time</Property>
+        <Property name="ShowUpDown">True</Property>
+        <Property name="Location">223, 28</Property>
+        <Property name="Name">MCDateTimePicker3</Property>
+        <Property name="Size">117, 26</Property>
+        <Property name="TabIndex">28</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCDateTimePicker, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDateTimePicker2" children="Controls">
+        <Property name="ValueChangedList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+        </Property>
+        <Property name="MCKey">enddate</Property>
+        <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="Format">Short</Property>
+        <Property name="Location">442, 26</Property>
+        <Property name="Name">MCDateTimePicker2</Property>
+        <Property name="Size">110, 26</Property>
+        <Property name="TabIndex">27</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCDateTimePicker, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDateTimePicker1" children="Controls">
+        <Property name="ValueChangedList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+        </Property>
+        <Property name="MCKey">startdate</Property>
+        <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="CalendarFont">宋体, 12pt</Property>
+        <Property name="Format">Short</Property>
+        <Property name="Location">114, 28</Property>
+        <Property name="Name">MCDateTimePicker1</Property>
+        <Property name="Size">110, 26</Property>
+        <Property name="TabIndex">26</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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDE1ZDFlMWZhMzMwNjRkM2Q5ODZiMTlkNzljYWIyYTEwBgYAAAAG5p+l6K+iBgcAAAAV5p+l6K+i5bmy5re35py65oql6KGoCw==</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 name="TextName" />
+        <Property name="NewFillColor">Red</Property>
+        <Property name="OldFillColor">DarkGray</Property>
+        <Property name="Text">查询</Property>
+        <Property name="Dock">Right</Property>
+        <Property name="Location">1140, 22</Property>
+        <Property name="Name">MCButton3</Property>
+        <Property name="Size">125, 39</Property>
+        <Property name="TabIndex">25</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel2" 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">宋体, 12pt</Property>
+        <Property name="Location">364, 31</Property>
+        <Property name="Name">MCLabel2</Property>
+        <Property name="Size">72, 16</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel1" children="Controls">
+        <Property name="Format" />
+        <Property name="TextName" />
+        <Property name="NewFillColor">Red</Property>
+        <Property name="OldFillColor">DarkGray</Property>
+        <Property name="MCKey" />
+        <Property name="MCDataSourceID" />
+        <Property name="IsDbControl">False</Property>
+        <Property name="InitDataSource" />
+        <Property name="ActionDataSource" />
+        <Property name="BindDataSource" />
+        <Property name="DbOptionType">None</Property>
+        <Property name="MCVisible">True</Property>
+        <Property name="MCEnabled">True</Property>
+        <Property name="Text">开始时间</Property>
+        <Property name="Font">宋体, 12pt</Property>
+        <Property name="Location">36, 33</Property>
+        <Property name="Name">MCLabel1</Property>
+        <Property name="Size">72, 16</Property>
+      </Object>
+      <Property name="TabStop">False</Property>
+      <Property name="Text">查询条件</Property>
+      <Property name="Dock">Top</Property>
+      <Property name="Font">宋体, 12pt, style=Bold</Property>
+      <Property name="Location">0, 0</Property>
+      <Property name="Name">GroupBox1</Property>
+      <Property name="Size">1268, 64</Property>
+      <Property name="TabIndex">6</Property>
+    </Object>
+    <Property name="LoadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</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">1284, 813</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">湿混机报表</Property>
+  </Object>
diff --git a/Main/MCRun/Program.cs b/Main/MCRun/Program.cs
index b432696..11cc8c4 100644
--- a/Main/MCRun/Program.cs
+++ b/Main/MCRun/Program.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
-using System.Text;
 using System.IO;
 using System.Windows.Forms;
 using ICSharpCode.Core;
-using ICSharpCode.Core.Services;
 using Mesnac.Gui.Run.Global;
 namespace MCRun
 {
@@ -13,10 +10,7 @@ namespace MCRun
     using Mesnac.DoUtils;
     using Mesnac.Gui.Workbench;
     using Mesnac.PlcUtils;
-    using Mesnac.PlcUtils.common;
     using Mesnac.PlcUtils.enumInfo;
-    using Mesnac.PlcUtils.Impl;
-    using System.Drawing.Drawing2D;
 
     class Program
     {