add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs

@@ -3337,6 +3337,45 @@ namespace Mesnac.Action.ChemicalWeighing
         /// 速度
         /// </summary>
         public DataKeyValue dryer_mixSpeed { get; set; }
+
+
+
+        /// <summary>
+        /// 设备编号 
+        /// </summary>
+        public DataKeyValue geler_dos_eqNo { get; set; }
+        /// <summary>
+        /// 批次号 
+        /// </summary>
+        public DataKeyValue geler_dos_batch { get; set; }
+        /// <summary>
+        /// 物料代码 
+        /// </summary>
+        public DataKeyValue geler_dos_matCode { get; set; }
+        /// <summary>
+        /// 设定重量 
+        /// </summary>
+        public DataKeyValue geler_dos_setValue { get; set; }
+        /// <summary>
+        /// 设定公差 
+        /// </summary>
+        public DataKeyValue geler_dos_setToler { get; set; }
+        /// <summary>
+        /// 实际重量 
+        /// </summary>
+        public DataKeyValue geler_dos_actValue { get; set; }
+        /// <summary>
+        /// 实际公差 
+        /// </summary>
+        public DataKeyValue geler_dos_actToLer { get; set; }
+
+
+
+
+
+
+
+
         #endregion
 
     }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Entity/Report/Report_GelDoser.cs

@@ -0,0 +1,126 @@
+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_GelDoser
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="id"></param>
+        public Report_GelDoser(Guid id = default)
+        {
+            report_Id = id == default ? Guid.NewGuid() : id;
+        }
+
+        /// <summary>
+        /// 报表Id
+        /// </summary>
+        public Guid report_Id { get; set; }
+
+        /// <summary>
+        /// Dos
+        /// </summary>
+        public List<GelDoserDos_Water> dos { get; set; }
+
+        /// <summary>
+        /// Mix
+        /// </summary>
+        public List<GelDoserMix> mix { get; set; }
+    }
+
+    public class GelDoserDos_Water
+    {
+        /// <summary>
+        /// 设备编号 
+        /// </summary>
+        public int eqNo { get; set; }
+        /// <summary>
+        /// 批次号 
+        /// </summary>
+        public int batch { get; set; }
+        /// <summary>
+        /// 物料代码 
+        /// </summary>
+        public int matCode { get; set; }
+        /// <summary>
+        /// 设定重量 
+        /// </summary>
+        public double setValue { get; set; }
+        /// <summary>
+        /// 设定公差 
+        /// </summary>
+        public double setToler { get; set; }
+        /// <summary>
+        /// 实际重量 
+        /// </summary>
+        public double actValue { get; set; }
+        /// <summary>
+        /// 实际公差 
+        /// </summary>
+        public double actToLer { get; set; }
+        /// <summary>
+        /// 步骤编号
+        /// </summary>
+        public int dos { get; set; }
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+        public string recordTime { get; set; }
+    }
+
+
+    
+
+
+    public class GelDoserMix
+    {
+        /// <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; }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs

@@ -159,8 +159,9 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
 
                     //FinishBatchHelper.SaveGHData();
 
-                    ReportDryMixerSaveHelper.Instance.Save();
-                    ReportWetMixerSaveHelper.Instance.SaveWetMixerReport();
+                    //ReportDryMixerSaveHelper.Instance.Save();
+                    //ReportWetMixerSaveHelper.Instance.SaveWetMixerReport();
+                    ReportGelDoserSaveHelper.Instance.SaveGelDoserReport();
                     #endregion
 
                     #region 8、更新物料名称

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportGelDoserHelper.cs

@@ -0,0 +1,324 @@
+using Mesnac.Action.ChemicalWeighing.Entity.Report;
+using Mesnac.Codd.Session;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Web.Script.Serialization;
+
+namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
+{
+    public sealed class ReportGelDoserSaveHelper
+    {
+
+        private static readonly Lazy<ReportGelDoserSaveHelper> lazy = new Lazy<ReportGelDoserSaveHelper>(() => new ReportGelDoserSaveHelper());
+        public static ReportGelDoserSaveHelper Instance
+        {
+            get
+            {
+                return lazy.Value;
+            }
+        }
+
+        private ReportGelDoserSaveHelper() { }
+
+        /// <summary>
+        /// 糊化机报表数据保存
+        /// </summary>
+        public void SaveGelDoserReport()
+        {
+            try
+            {
+                ICSharpCode.Core.LoggingService<ReportGelDoserSaveHelper>.Debug("糊化机报表数据保存开始！！！");
+                //准备信号读取
+                //if (BasePlcHelper.Instance.RdyRpt_D1.NowValue.ToInt() == 1)
+                //{
+                //    Report_GelDoser gelDoser_dos0 = readGelDoser("A"); //读取报表数据
+                //    SaveReportDb(gelDoser_dos0); //保存报表数据
+                //}
+                //else if (BasePlcHelper.Instance.RdyRpt_D1.NowValue.ToInt() == 2)
+                //{
+                //    Report_GelDoser gelDoser_dos0 = readGelDoser("B"); //读取报表数据
+                //    SaveReportDb(gelDoser_dos0); //保存报表数据
+                //}
+                //else if (BasePlcHelper.Instance.RdyRpt_D1.NowValue.ToInt() == 3)
+                //{
+                //    Report_GelDoser gelDoser_dos0 = readGelDoser("C"); //读取报表数据
+                //    SaveReportDb(gelDoser_dos0); //保存报表数据
+                //}
+                //else if (BasePlcHelper.Instance.RdyRpt_D1.NowValue.ToInt() == 4)
+                //{
+                //    Report_GelDoser gelDoser_dos0 = readGelDoser("D"); //读取报表数据
+                //    SaveReportDb(gelDoser_dos0); //保存报表数据
+                //}
+
+                Report_GelDoser gelDoser_dos0 = readGelDoser("A"); //读取报表数据
+                SaveReportDb(gelDoser_dos0); //保存报表数据
+
+
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportGelDoserSaveHelper>.Error(String.Format("糊化机报表数据保存异常：{0}", ex.Message), ex);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 通过PLC读取糊化机报表数据
+        /// </summary>
+        /// <param name="machineType">糊化机A、糊化机B</param>
+        /// <param name="dos">操作步骤：Dos[0]、Dos[1]、Dos[2]、Dos[3]</param>
+        /// <returns></returns>
+        private Report_GelDoser readGelDoser(string machineType)
+        {
+            Report_GelDoser _gelDoser = null;
+            try
+            {
+                _gelDoser = new Report_GelDoser();
+                _gelDoser.dos = readGelDoserDos(machineType, 6);
+                _gelDoser.mix = readGelDoserMix(machineType, 10);
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportGelDoserSaveHelper>.Error(String.Format("通过PLC读取糊化机报表数读取异常：{0}", ex.Message), ex);
+            }
+            return _gelDoser;
+        }
+
+
+
+        /// <summary>
+        /// 读取糊化机Dos数据
+        /// </summary>
+        /// <param name="machineType"></param>
+        /// <param name="amount"></param>
+        /// <returns></returns>
+        private List<GelDoserDos_Water> readGelDoserDos(string machineType, int amount)
+        {
+            List<GelDoserDos_Water> gelDoserDoes = new List<GelDoserDos_Water>();
+            for (int dos = 0; dos < amount; dos++)
+            {
+                #region 实例化参数
+                if (dos < 4)
+                {
+                    BasePlcHelper.Instance.geler_dos_eqNo = new Entity.DataKeyValue($"gelDosing{machineType}_dos{dos}_eqNo");
+                    BasePlcHelper.Instance.geler_dos_batch = new Entity.DataKeyValue($"gelDosing{machineType}_dos{dos}_batch");
+                    BasePlcHelper.Instance.geler_dos_matCode = new Entity.DataKeyValue($"gelDosing{machineType}_dos{dos}_matCode");
+                    BasePlcHelper.Instance.geler_dos_setValue = new Entity.DataKeyValue($"gelDosing{machineType}_dos{dos}_setValue");
+                    BasePlcHelper.Instance.geler_dos_setToler = new Entity.DataKeyValue($"gelDosing{machineType}_dos{dos}_setToler");
+                    BasePlcHelper.Instance.geler_dos_actValue = new Entity.DataKeyValue($"gelDosing{machineType}_dos{dos}_actValue");
+                    BasePlcHelper.Instance.geler_dos_actToLer = new Entity.DataKeyValue($"gelDosing{machineType}_dos{dos}_actToLer");
+                } 
+                else if (dos == 4)
+                {
+                    BasePlcHelper.Instance.geler_dos_eqNo = new Entity.DataKeyValue($"gelDosing{machineType}_hotWater_eqNo");
+                    BasePlcHelper.Instance.geler_dos_batch = new Entity.DataKeyValue($"gelDosing{machineType}_hotWater_batch");
+                    BasePlcHelper.Instance.geler_dos_matCode = new Entity.DataKeyValue($"gelDosing{machineType}_hotWater_matCode");
+                    BasePlcHelper.Instance.geler_dos_setValue = new Entity.DataKeyValue($"gelDosing{machineType}_hotWater_setValue");
+                    BasePlcHelper.Instance.geler_dos_setToler = new Entity.DataKeyValue($"gelDosing{machineType}_hotWater_setToler");
+                    BasePlcHelper.Instance.geler_dos_actValue = new Entity.DataKeyValue($"gelDosing{machineType}_hotWater_actValue");
+                    BasePlcHelper.Instance.geler_dos_actToLer = new Entity.DataKeyValue($"gelDosing{machineType}_hotWater_actToLer");
+                }
+                else if(dos == 5)
+                {
+                    BasePlcHelper.Instance.geler_dos_eqNo = new Entity.DataKeyValue($"gelDosing{machineType}_coolWater_eqNo");
+                    BasePlcHelper.Instance.geler_dos_batch = new Entity.DataKeyValue($"gelDosing{machineType}_coolWater_batch");
+                    BasePlcHelper.Instance.geler_dos_matCode = new Entity.DataKeyValue($"gelDosing{machineType}_coolWater_matCode");
+                    BasePlcHelper.Instance.geler_dos_setValue = new Entity.DataKeyValue($"gelDosing{machineType}_coolWater_setValue");
+                    BasePlcHelper.Instance.geler_dos_setToler = new Entity.DataKeyValue($"gelDosing{machineType}_coolWater_setToler");
+                    BasePlcHelper.Instance.geler_dos_actValue = new Entity.DataKeyValue($"gelDosing{machineType}_coolWater_actValue");
+                    BasePlcHelper.Instance.geler_dos_actToLer = new Entity.DataKeyValue($"gelDosing{machineType}_coolWater_actToLer");
+                }
+                #endregion
+
+                GelDoserDos_Water gelDoserDos = new GelDoserDos_Water()
+                {
+                    eqNo = BasePlcHelper.Instance.geler_dos_eqNo.NowValue.ToInt(),
+                    batch = BasePlcHelper.Instance.geler_dos_batch.NowValue.ToInt(),
+                    matCode = BasePlcHelper.Instance.geler_dos_matCode.NowValue.ToInt(),
+                    setValue = BasePlcHelper.Instance.geler_dos_setValue.NowValue.ToDouble(),
+                    setToler = BasePlcHelper.Instance.geler_dos_setToler.NowValue.ToDouble(),
+                    actValue = BasePlcHelper.Instance.geler_dos_actValue.NowValue.ToDouble(),
+                    actToLer = BasePlcHelper.Instance.geler_dos_actToLer.NowValue.ToDouble(),
+                    dos = dos,
+                    recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                };
+                gelDoserDoes.Add(gelDoserDos);
+            }
+            return gelDoserDoes;
+        }
+
+        /// <summary>
+        /// 读取糊化机Mix数据
+        /// </summary>
+        /// <param name="machineType"></param>
+        /// <param name="amount"></param>
+        /// <returns></returns>
+        private List<GelDoserMix> readGelDoserMix(string machineType, int amount)
+        {
+            List<GelDoserMix> gelDoserMixes = new List<GelDoserMix>();
+            for (int mix = 0; mix < amount; mix++)
+            {
+                #region 实例化参数
+                var eqNo = new Entity.DataKeyValue($"gelDosing{machineType}_gelMixing{mix}_eqNo");
+                var mixBatch = new Entity.DataKeyValue($"gelDosing{machineType}_gelMixing{mix}_mixBatch");
+                var mixStep = new Entity.DataKeyValue($"gelDosing{machineType}_gelMixing{mix}_mixStep");
+                var actCode = new Entity.DataKeyValue($"gelDosing{machineType}_gelMixing{mix}_actCode");
+                var mixTime = new Entity.DataKeyValue($"gelDosing{machineType}_gelMixing{mix}_mixTime");
+                var mixTemp = new Entity.DataKeyValue($"gelDosing{machineType}_gelMixing{mix}_mixTemp");
+                var mixSpeed = new Entity.DataKeyValue($"gelDosing{machineType}_gelMixing{mix}_mixSpeed");
+                #endregion
+
+                GelDoserMix gelDoserMix = new GelDoserMix()
+                {
+                    eqNo = eqNo.NowValue.ToInt(),
+                    mixBatch = mixBatch.NowValue.ToInt(),
+                    mixStep = mixStep.NowValue.ToInt(),
+                    actCode = actCode.NowValue.ToInt(),
+                    mixTime = mixTime.NowValue.ToInt(),
+                    mixTemp = mixTemp.NowValue.ToDouble(),
+                    mixSpeed = mixSpeed.NowValue.ToDouble(),
+                    mix = mix,
+                    recordTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                };
+                gelDoserMixes.Add(gelDoserMix);
+            }
+
+            return gelDoserMixes;
+        }
+
+
+
+        /// <summary>
+        /// 保存糊化机报表数据至数据库
+        /// </summary>
+        /// <param name="_gelDoser"></param>
+        private void SaveReportDb(Report_GelDoser _gelDoser)
+        {
+            JavaScriptSerializer serializer = new JavaScriptSerializer();
+            try
+            {
+                string str = serializer.Serialize(_gelDoser);
+                if (_gelDoser != null)
+                {
+                    if (_gelDoser.dos != null)
+                    {
+                        InsertReportGelDoser(_gelDoser.report_Id, _gelDoser.dos);
+                    }
+                    if (_gelDoser.mix != null)
+                    {
+                        InsertReportGelDoserDetail(_gelDoser.report_Id, _gelDoser.mix);
+                    }
+                }
+
+
+                ICSharpCode.Core.LoggingService<ReportGelDoserSaveHelper>.Warn($"报表数据打印：{str}");
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportGelDoserSaveHelper>.Error(String.Format("保存报表数据至数据库异常：{0}", ex.Message), ex);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 保存糊化机报表数据
+        /// </summary>
+        /// <param name="reportId"></param>
+        /// <param name="_gelDoserDos"></param>
+        private void InsertReportGelDoser(Guid reportId, List<GelDoserDos_Water> gelDosers)
+        {
+            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_GelDoser
+                                (reportId, eqNo, batch, matCode, setValue, setToler, actValue, actToLer, dos)
+                            values
+                                (@reportId, @eqNo, @batch, @matCode, @setValue, @setToler, @actValue, @actToLer, @dos)";
+
+                    foreach (GelDoserDos_Water _gelDoserDos in gelDosers)
+                    {
+                        if (_gelDoserDos.actValue == 0) continue;
+
+                        dbHelper.ClearParameter();
+                        dbHelper.CommandType = CommandType.Text;
+                        dbHelper.CommandText = sqlStr;
+                        dbHelper.AddParameter("@reportId", reportId);
+                        dbHelper.AddParameter("@eqNo", _gelDoserDos.eqNo);
+                        dbHelper.AddParameter("@batch", _gelDoserDos.batch);
+                        dbHelper.AddParameter("@matCode", _gelDoserDos.matCode);
+                        dbHelper.AddParameter("@setValue", _gelDoserDos.setValue);
+                        dbHelper.AddParameter("@setToler", _gelDoserDos.setToler);
+                        dbHelper.AddParameter("@actValue", _gelDoserDos.actValue);
+                        dbHelper.AddParameter("@actToLer", _gelDoserDos.actToLer);
+                        dbHelper.AddParameter("@dos", _gelDoserDos.dos);
+                        dbHelper.ExecuteNonQuery();
+
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportGelDoserSaveHelper>.Error(String.Format("保存糊化机报表数据异常：{0}", ex.Message), ex);
+            }
+        }
+
+        /// <summary>
+        /// 保存糊化机报表明细数据
+        /// </summary>
+        /// <param name="reportId"></param>
+        /// <param name="_gelDoserMix"></param>
+        private void InsertReportGelDoserDetail(Guid reportId, List<GelDoserMix> gelDosers)
+        {
+            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_GelDoser_Detail 
+                                    (reportId, eqNo, mixBatch, mixStep, actCode, mixTime, mixTemp, mixSpeed, mix)
+                                values 
+                                    (@reportId, @eqNo, @mixBatch, @mixStep, @actCode, @mixTime, @mixTemp, @mixSpeed, @mix)";
+                    foreach (GelDoserMix _gelDoserMix in gelDosers)
+                    {
+                        if (_gelDoserMix.actCode == 0) continue;
+
+                        dbHelper.ClearParameter();
+                        dbHelper.CommandType = CommandType.Text;
+                        dbHelper.CommandText = sqlStr;
+                        dbHelper.AddParameter("@reportId", reportId);
+                        dbHelper.AddParameter("@eqNo", _gelDoserMix.eqNo);
+                        dbHelper.AddParameter("@mixBatch", _gelDoserMix.mixBatch);
+                        dbHelper.AddParameter("@mixStep", _gelDoserMix.mixStep);
+                        dbHelper.AddParameter("@actCode", _gelDoserMix.actCode);
+                        dbHelper.AddParameter("@mixTime", _gelDoserMix.mixTime);
+                        dbHelper.AddParameter("@mixTemp", _gelDoserMix.mixTemp);
+                        dbHelper.AddParameter("@mixSpeed", _gelDoserMix.mixSpeed);
+                        dbHelper.AddParameter("@mix", _gelDoserMix.mix);
+                        dbHelper.ExecuteNonQuery();
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                ICSharpCode.Core.LoggingService<ReportGelDoserSaveHelper>.Error(String.Format("保存糊化机报表明细数据异常：{0}", ex.Message), ex);
+            }
+        }
+
+
+    }
+}

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

@@ -214,11 +214,13 @@
     <Compile Include="DeviceParamManage\WriteDeviceParamInfo.cs" />
     <Compile Include="Entity\RecordSaveDataInfo.cs" />
     <Compile Include="Entity\Report\LR_BarcodeLog.cs" />
+    <Compile Include="Entity\Report\Report_GelDoser.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" />
+    <Compile Include="FinishBatch\SaveHelper\ReportGelDoserHelper.cs" />
     <Compile Include="FinishBatch\SaveHelper\ReportSaveHelper.cs" />
     <Compile Include="FinishBatch\SaveHelper\ReportWetMixerSaveHelper.cs" />
     <Compile Include="FinishBatch\SCADAHelper\AlarmRefreshActionForExtend.cs" />
@@ -505,6 +507,10 @@
     <Compile Include="Report\DryMixer\InitFormAction.cs" />
     <Compile Include="Report\DryMixer\SelectAction.cs" />
     <Compile Include="Report\DryMixer\SelectRowAction.cs" />
+    <Compile Include="Report\GelDoser\ExportAction.cs" />
+    <Compile Include="Report\GelDoser\InitFormAction.cs" />
+    <Compile Include="Report\GelDoser\SelectAction.cs" />
+    <Compile Include="Report\GelDoser\SelectRowAction.cs" />
     <Compile Include="Report\MaterialStatisticsReport\ExportAction.cs" />
     <Compile Include="Report\MaterialStatisticsReport\InitFormAction.cs" />
     <Compile Include="Report\MaterialStatisticsReport\SelectWeightAction.cs" />

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/ExportAction.cs

@@ -0,0 +1,179 @@
+using DevExpress.Utils.Drawing.Helpers;
+using ICSharpCode.Core;
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.Entity.Report;
+using Mesnac.Action.ChemicalWeighing.Report.ProductionReport;
+using Microsoft.Office.Interop.Excel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser
+{
+    /// <summary>
+    /// 糊化机报表导出事件
+    /// </summary>
+    public class ExportAction : ChemicalWeighingAction, Base.IAction
+    {
+        private Control _clientGridControl = null;      //报表明细DGV
+        private DbMCControl _dgvGelDoser = null;      //报表数据DGV
+
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime);        //必须要调用的
+            ICSharpCode.Core.LoggingService<ExportAction>.Debug("糊化机报表-导出...");
+
+            this._dgvGelDoser = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Report_GelDoser").FirstOrDefault();
+            DataGridView _GelDoserGridView = this._dgvGelDoser.BaseControl as DataGridView;
+
+            if (_GelDoserGridView != null)
+            {
+                GelDoserDos_Water gelDoserDos = new GelDoserDos_Water();
+                gelDoserDos.eqNo = ParseToInt(_GelDoserGridView.SelectedRows[0].Cells["eqNo"].Value.ToString());
+                gelDoserDos.dos = ParseToInt(_GelDoserGridView.SelectedRows[0].Cells["dos"].Value.ToString());
+                gelDoserDos.batch = ParseToInt(_GelDoserGridView.SelectedRows[0].Cells["batch"].Value.ToString());
+                gelDoserDos.matCode = ParseToInt(_GelDoserGridView.SelectedRows[0].Cells["matCode"].Value.ToString());
+                gelDoserDos.setValue = Convert.ToDouble(_GelDoserGridView.SelectedRows[0].Cells["setValue"].Value);
+                gelDoserDos.setToler = Convert.ToDouble(_GelDoserGridView.SelectedRows[0].Cells["setToler"].Value);
+                gelDoserDos.actValue = Convert.ToDouble(_GelDoserGridView.SelectedRows[0].Cells["actValue"].Value);
+                gelDoserDos.actToLer = Convert.ToDouble(_GelDoserGridView.SelectedRows[0].Cells["actToLer"].Value);
+                gelDoserDos.recordTime = _GelDoserGridView.SelectedRows[0].Cells["recordTime"].Value.ToString();
+
+                SaveFileDialog sfd = new SaveFileDialog();
+                sfd.Filter = "xls files(*.xls)|*.xls";
+                sfd.FileName = String.Format("糊化机报表_{0:yyyyMMdd}", DateTime.Now);
+                sfd.AddExtension = true;
+                DialogResult result = sfd.ShowDialog();
+
+                if (result == DialogResult.OK)
+                {
+                    this._clientGridControl = GetAllControls().Where(x => x.Name.Contains("MultiColHeaderDgv")).FirstOrDefault();
+
+                    if (_clientGridControl == null)
+                    {
+                        ICSharpCode.Core.LoggingService<SelectPlanAction>.Warn("{生产报表} 缺少缺少称量名细MultiColHeaderDgv控件...");
+                        runtime.IsReturn = false;
+                        return;
+                    }
+
+                    Mesnac.Controls.Default.MultiColHeaderDgv clientGrid = (this._clientGridControl as Mesnac.Controls.Default.MultiColHeaderDgv);
+                    System.Data.DataTable dt = clientGrid.DataSource as System.Data.DataTable;
+
+                    string fileName = sfd.FileName;
+                    if (!String.IsNullOrEmpty(fileName))
+                    {
+                        try
+                        {
+                            //写入Excle
+                            DataTabletoExcel(fileName, dt, gelDoserDos);
+                            string msg1 = "糊化机报表导出成功";      //导出生产报表数据至Excel成功!
+                            ICSharpCode.Core.LoggingService<ExportAction>.Info(msg1);
+                            MessageBox.Show(msg1, Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        }
+                        catch (Exception ex)
+                        {
+                            string msg1 = $"糊化机报表导出异常:{ex.Message}";
+                            ICSharpCode.Core.LoggingService<ExportAction>.Error(msg1);
+                            MessageBox.Show(msg1, Mesnac.Basic.LanguageHelper.WarnCaption, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        }
+                    }
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// 写入到Excel文件
+        /// </summary>
+        /// <param name="strFileName"></param>
+        /// <param name="tmpDataTable"></param>
+        /// <param name="gelDoserDos"></param>
+        public void DataTabletoExcel(string strFileName, System.Data.DataTable tmpDataTable, GelDoserDos_Water gelDoserDos)
+        {
+            ///先得到datatable的行数
+            int rowNum = tmpDataTable.Rows.Count;
+            ///列数
+            int columnNum = tmpDataTable.Columns.Count;
+            ///声明一个应用程序类实例
+            Microsoft.Office.Interop.Excel.Application xlApp = new ApplicationClass();
+
+            //创建一个新工作簿
+            Workbook xlBook = xlApp.Workbooks.Add();
+            ///在工作簿中得到sheet。
+            _Worksheet oSheet = (_Worksheet)xlBook.Worksheets[1];
+
+            #region 绘制列
+
+            //绘制配方名和开始时间
+            oSheet.Cells[1, 1] = "设备";
+            oSheet.Cells[1, 2] = "Dos";
+            oSheet.Cells[1, 3] = "批次号";
+            oSheet.Cells[1, 4] = "物料代码";
+            oSheet.Cells[1, 5] = "设定重量";
+            oSheet.Cells[1, 6] = "设定公差";
+            oSheet.Cells[1, 7] = "实际重量";
+            oSheet.Cells[1, 8] = "实际公差";
+            oSheet.Cells[1, 9] = "记录时间";
+            oSheet.Cells[2, 1] = gelDoserDos.eqNo;
+            oSheet.Cells[2, 2] = gelDoserDos.dos;
+            oSheet.Cells[2, 3] = gelDoserDos.batch;
+            oSheet.Cells[2, 4] = gelDoserDos.matCode;
+            oSheet.Cells[2, 5] = gelDoserDos.setValue;
+            oSheet.Cells[2, 6] = gelDoserDos.setToler;
+            oSheet.Cells[2, 7] = gelDoserDos.actValue;
+            oSheet.Cells[2, 8] = gelDoserDos.setToler;
+            oSheet.Cells[2, 9] = gelDoserDos.recordTime;
+
+
+
+            //自定义方法，绘制合并表头
+            oSheet.Cells[3, 1] = "设备";
+            oSheet.Cells[3, 2] = "Mix";
+            oSheet.Cells[3, 3] = "批次";
+            oSheet.Cells[3, 4] = "步号";
+            oSheet.Cells[3, 5] = "动作";
+            oSheet.Cells[3, 6] = "时间";
+            oSheet.Cells[3, 7] = "温度";
+            oSheet.Cells[3, 8] = "速度";
+            oSheet.Cells[3, 9] = "记录时间";
+
+            #endregion
+
+            //将DataTable中的数据导入Excel中
+            for (int i = 0; i < rowNum; i++)
+            {
+                for (int j = 0; j < columnNum; j++)
+                {
+                    ///excel中的列是从1开始的
+                    xlApp.Cells[i + 4, j + 1] = tmpDataTable.Rows[i][j].ToString();
+                }
+            }
+            oSheet.SaveAs(strFileName);
+        }
+
+        /// <summary>
+        /// 字符串转Int
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        private int ParseToInt(string str)
+        {
+            int returnInt = 0;
+            if (str == null || str.Trim().Length < 1)
+            {
+                return returnInt;
+            }
+            if (int.TryParse(str, out returnInt))
+            {
+                return returnInt;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/InitFormAction.cs

@@ -0,0 +1,38 @@
+using Mesnac.Action.Base;
+using Mesnac.Controls.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser
+{
+    /// <summary>
+    /// 糊化机报表窗体初始化事件
+    /// </summary>
+    public class InitFormAction : ChemicalWeighingAction, IAction
+    {
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime);       //必须要调用的
+            ICSharpCode.Core.LoggingService<InitFormAction>.Debug("糊化机报表-窗体初始化...");
+
+            #region 获取界面控件
+
+            DbMCControl clientGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Report_GelDoser").FirstOrDefault();         //获取本机台计划网格控件
+
+            if (clientGridControl == null)
+            {
+                ICSharpCode.Core.LoggingService<InitFormAction>.Error("{糊化机报表-窗体加载} 缺少日志网格控件...");
+                return;
+            }
+
+            #endregion
+
+            List<DbMCControl> mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件
+            IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl;
+            startdate.MCValue = DateTime.Now.AddDays(-7);
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectAction.cs

@@ -0,0 +1,82 @@
+using Mesnac.Action.Base;
+using Mesnac.Codd.Session;
+using Mesnac.Controls.Base;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser
+{
+    /// <summary>
+    /// 糊化机报表查询事件
+    /// </summary>
+    public class SelectAction : ChemicalWeighingAction, IAction
+    {
+        public void Run(RuntimeParameter runtime)
+        {
+
+            base.RunIni(runtime);       //必须要调用的
+
+            ICSharpCode.Core.LoggingService<SelectAction>.Debug("糊化机报表-查询...");
+
+            DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
+            if (dbHelper == null)
+            {
+                ICSharpCode.Core.LoggingService<ExportAction>.Error("获取本地数据连接失败...");
+                return;
+            }
+            dbHelper.ClearParameter();
+
+            StringBuilder sbSql = new StringBuilder(@"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_GelDoser t1 
+                                                        left join Device t2 on t1.eqNo = t2.Id
+                                                        where 1=1");
+            List<DbMCControl> mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件
+
+            IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl;
+            IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl;
+            if (startdate != null && starttime != null)
+            {
+                //Append
+                sbSql.AppendLine(@"AND t1.recordTime>='" + Convert.ToDateTime(startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(starttime.MCValue).ToShortTimeString() + "' ");
+            }
+            else
+            {
+                ICSharpCode.Core.LoggingService<SelectAction>.Debug("{糊化机报表-查询} 缺少key值为startdate或者starttime的时间查询条件...");
+                return;
+            }
+
+            IBaseControl enddate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "enddate").FirstOrDefault().BaseControl;
+            IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl;
+            if (enddate != null && endtime != null)
+            {
+                sbSql.AppendLine(@"AND t1.recordTime<='" + Convert.ToDateTime(enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(endtime.MCValue).ToShortTimeString() + "' ");
+            }
+            else
+            {
+                ICSharpCode.Core.LoggingService<SelectAction>.Debug("{糊化机报表-查询} 缺少key值为enddate或者enddate的时间查询条件...");
+                return;
+            }
+            sbSql.Append(" ORDER BY t1.recordTime desc");
+
+            dbHelper.CommandText = sbSql.ToString();
+            dbHelper.CommandType = System.Data.CommandType.Text;
+            DataTable table = dbHelper.ToDataTable();
+
+            //刷新DataGridView数据
+            DbMCControl _dgvGelDoser = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Report_GelDoser").FirstOrDefault();
+            if (_dgvGelDoser == null || !(_dgvGelDoser.BaseControl is DataGridView))
+            {
+                ICSharpCode.Core.LoggingService<SelectAction>.Warn("{糊化机报表-查询} 缺少系统日志DataGridView控件...");
+                runtime.IsReturn = false;
+                return;
+            }
+            _dgvGelDoser.BaseControl.BindDataSource = table;
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectRowAction.cs

@@ -0,0 +1,94 @@
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.Report.ProductionReport;
+using Mesnac.Codd.Session;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser
+{
+    /// <summary>
+    /// 糊化机报表明细查询事件
+    /// </summary>
+    public class SelectRowAction : ChemicalWeighingAction, IAction
+    {
+        private Control _clientGridControl = null;      //多维表控件
+
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime);       //必须要调用的
+
+            ICSharpCode.Core.LoggingService<SelectAction>.Debug("糊化机报表-明细查询...");
+
+            //获取报表数据
+            DbMCControl _dgvGelDoser = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Report_GelDoser").FirstOrDefault();
+            if (_dgvGelDoser == null || !(_dgvGelDoser.BaseControl is DataGridView))
+            {
+                ICSharpCode.Core.LoggingService<SelectPlanAction>.Warn("{生产报表} 缺少糊化机报表DataGridView控件...");
+                runtime.IsReturn = false;
+                return;
+            }
+
+            DataGridView _GelDoserGridView = _dgvGelDoser.BaseControl as DataGridView;
+
+            this._clientGridControl = GetAllControls().Where(x => x.Name.Contains("MultiColHeaderDgv")).FirstOrDefault();
+
+            if (_clientGridControl == null)
+            {
+                ICSharpCode.Core.LoggingService<SelectPlanAction>.Warn("{生产报表} 缺少缺少称量名细MultiColHeaderDgv控件...");
+                runtime.IsReturn = false;
+                return;
+            }
+
+            Mesnac.Controls.Default.MultiColHeaderDgv clientGrid = (this._clientGridControl as Mesnac.Controls.Default.MultiColHeaderDgv);
+
+            #region 明细控件格式化
+
+            clientGrid.myColHeaderTreeView = null;
+            clientGrid.DataSource = null;
+            clientGrid.iNodeLevels = 0;
+            clientGrid.ColLists.Clear();
+            clientGrid.ColumnHeadersHeight = 23;
+            clientGrid.ScrollBars = ScrollBars.Both;
+            clientGrid.AllowUserToAddRows = false;
+            clientGrid.RowsDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            clientGrid.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+            clientGrid.ColumnHeadersDefaultCellStyle.Font = new System.Drawing.Font("宋体", 12);
+            clientGrid.DefaultCellStyle.Font = new System.Drawing.Font("宋体", 10);
+            clientGrid.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            #endregion
+
+            //获取选中行的ReportId，关联获取明细数据并赋值给明细控件
+            if (_GelDoserGridView.SelectedRows.Count == 1)
+            {
+                string lR_planID = _GelDoserGridView.SelectedRows[0].Cells["reportId"].Value as string;
+
+                //获取数据链接
+                DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
+                if (dbHelper == null)
+                {
+                    ICSharpCode.Core.LoggingService<ExportAction>.Error("获取本地数据连接失败...");
+                    return;
+                }
+                dbHelper.ClearParameter();
+
+                //获取明细数据
+                StringBuilder sqlStr = new StringBuilder(@"select t2.Name as 设备编号,t1.mix as Mix,t1. mixBatch as 批次,t1.mixStep as 步号,t1.actCode as 动作,
+		                                                        t1.mixTime as 时间,t1.mixTemp as 温度,t1.mixSpeed as 速度,t1.recordTime as 记录时间
+                                                        from Report_GelDoser_Detail t1
+                                                        left join Device t2 on t1.eqNo = t2.Id
+                                                        where t1.reportId = @reportId");
+                dbHelper.CommandText = sqlStr.ToString();
+                dbHelper.CommandType = System.Data.CommandType.Text;
+                dbHelper.AddParameter("@reportId", lR_planID);
+                DataTable table = dbHelper.ToDataTable();
+
+                clientGrid.DataSource = table;
+            }
+        }
+    }
+}

Main/MCEdit/Data/EventConfig/小料称量/工程调试.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<ActionService>
-    <Design>
-        <Path path="工程调试">
-            <Action action="463359B55FEC4526B2FA43A86E8168CB">
-              <Caption>初始化界面</Caption>
-              <Remark>初始化界面</Remark>
-            </Action>
-            <Action action="211DD50C99CA4088AD3307C040C8BD9C">
-              <Caption>打开</Caption>
-              <Remark>打开</Remark>
-            </Action>
-        </Path>
-    </Design>
-
-    <DesignToRuntime>
-        <Design action="463359B55FEC4526B2FA43A86E8168CB">
-          <Runtime action="9BE38EB2366743768C0A178E2B9ACC64"/>
-        </Design>
-        <Design action="211DD50C99CA4088AD3307C040C8BD9C">
-          <Runtime action="9518CD1B3E89493C85E38D151CE42A92"/>
-        </Design>
-    </DesignToRuntime>
-
-    <Runtime>
-        <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
-          <Action action="9BE38EB2366743768C0A178E2B9ACC64" class="Mesnac.Action.ChemicalWeighing.ProjectDebug.InitProjectDebugInfo"/>
-          <Action action="9518CD1B3E89493C85E38D151CE42A92" class="Mesnac.Action.ChemicalWeighing.ProjectDebug.InitProjectDebugInfo"/>
-        </Import>
-    </Runtime>
-</ActionService>

Main/MCEdit/Data/EventConfig/小料称量/榄菊报表.糊化机报表.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<ActionService>
+    <Design>
+        <Path path="榄菊报表/糊化机报表">
+            <Action action="463359B55FEC4526B2FA43A86E8168CB">
+              <Caption>窗体初始化</Caption>
+              <Remark>窗体初始化</Remark>
+            </Action>
+            <Action action="211DD50C99CA4088AD3307C040C8BD9C">
+              <Caption>查询</Caption>
+              <Remark>查询糊化机报表</Remark>
+            </Action>
+          <Action action="a9a397bdf1674ff780232a32fb326479">
+            <Caption>报表明细</Caption>
+            <Remark>报表明细</Remark>
+          </Action>
+
+          <Action action="1fd8fb4f072a4a28940bd3d8e4d9bfb3">
+            <Caption>导出</Caption>
+            <Remark>导出糊化机报表</Remark>
+          </Action>
+          
+        </Path>
+    </Design>
+
+    <DesignToRuntime>
+        <Design action="463359B55FEC4526B2FA43A86E8168CB">
+          <Runtime action="9BE38EB2366743768C0A178E2B9ACC64"/>
+        </Design>
+        <Design action="211DD50C99CA4088AD3307C040C8BD9C">
+          <Runtime action="9518CD1B3E89493C85E38D151CE42A92"/>
+        </Design>
+      <Design action="a9a397bdf1674ff780232a32fb326479">
+        <Runtime action="3976fc7c6d394efd82d4d13ae3444313"/>
+      </Design>
+
+      <Design action="1fd8fb4f072a4a28940bd3d8e4d9bfb3">
+        <Runtime action="4985eae6f3ae4563933a232d82e324cb"/>
+      </Design>
+    </DesignToRuntime>
+
+    <Runtime>
+        <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
+          <Action action="9BE38EB2366743768C0A178E2B9ACC64" class="Mesnac.Action.ChemicalWeighing.Report.GelDoser.InitFormAction"/>
+          <Action action="9518CD1B3E89493C85E38D151CE42A92" class="Mesnac.Action.ChemicalWeighing.Report.GelDoser.SelectAction"/>
+          <Action action="3976fc7c6d394efd82d4d13ae3444313" class="Mesnac.Action.ChemicalWeighing.Report.GelDoser.SelectRowAction"/>
+          <Action action="4985eae6f3ae4563933a232d82e324cb" class="Mesnac.Action.ChemicalWeighing.Report.GelDoser.ExportAction"/>
+        </Import>
+    </Runtime>
+</ActionService>

Main/MCEdit/Data/MCProject/SCWSProject2.mprj

@@ -36,7 +36,6 @@
       <Node Name="FormWeight" Text="称量配方管理" ToolTipText="FormWeight" Tag="FormWeight" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormMix" Text="混合配方管理" ToolTipText="FormMix" Tag="FormMix" ImageIndex="3" SelectedImageIndex="3" />
       <Node Name="FormProductLine" Text="榄菊产线管理" ToolTipText="FormProductLine" Tag="FormProductLine" ImageIndex="3" SelectedImageIndex="3" />
-
       <Node Name="FormDeviceMonitor" Text="榄菊设备监控" ToolTipText="FormDeviceMonitor" Tag="FormDeviceMonitor" ImageIndex="3" SelectedImageIndex="3" />
       <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" />
@@ -44,6 +43,7 @@
       <Node Name="FormSheBei" Text="榄菊设备配方" ToolTipText="FormSheBei" Tag="FormSheBei" 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 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" />

Main/MCEdit/Data/MCProject/nodeForm/湿混机报表.xml

@@ -110,7 +110,7 @@
       </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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDE2NWNiNmQ2ZGIxMDRjZTA5OGJkZWVhYmYwN2NmZTY4BgYAAAAG5a+85Ye6BgcAAAAV5a+85Ye65rm/5re35py65oql6KGoCw==</Binary>
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDE2NWNiNmQ2ZGIxMDRjZTA5OGJkZWVhYmYwN2NmZTY4BgYAAAAG5a+85Ye6BgcAAAAV5a+85Ye65rm/5re35py65oql6KGoCw==</Binary>
         </Property>
         <Property name="MCKey" />
         <Property name="MCDataSourceID" />

Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml

@@ -0,0 +1,314 @@
+
+  <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="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">1181, 352</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, 424</Property>
+      <Property name="Name">GroupBox3</Property>
+      <Property name="Size">1187, 377</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="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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAARAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIGE5YTM5N2JkZjE2NzRmZjc4MDIzMmEzMmZiMzI2NDc5BgYAAAAM5oql6KGo5piO57uGBgcAAAAM5oql6KGo5piO57uGCw==</Binary>
+        </Property>
+        <Property name="SelectionChangedActionList">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=</Binary>
+        </Property>
+        <Property name="MCKey">[DataSource1].[Report_GelDoser]</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="AutoGenerateColumns">False</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">1181, 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">1187, 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="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">
+          <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L</Binary>
+        </Property>
+        <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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDFmZDhmYjRmMDcyYTRhMjg5NDBiZDNkOGU0ZDliZmIzBgYAAAAG5a+85Ye6BgcAAAAV5a+85Ye657OK5YyW5py65oql6KGoCw==</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">938, 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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAZAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIxMURENTBDOTlDQTQwODhBRDMzMDdDMDQwQzhCRDlDBgYAAAAG5p+l6K+iBgcAAAAV5p+l6K+i57OK5YyW5py65oql6KGoCw==</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">1059, 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">1187, 64</Property>
+      <Property name="TabIndex">6</Property>
+    </Object>
+    <Property name="LoadActionList">
+      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ2MzM1OUI1NUZFQzQ1MjZCMkZBNDNBODZFODE2OENCBgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw==</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">1203, 840</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>

Main/MCEdit/MCEdit.csproj

@@ -186,7 +186,7 @@
     <Content Include="Data\EventConfig\小料称量\业务基础.系统日志.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Data\EventConfig\小料称量\工程调试.xml">
+    <Content Include="Data\EventConfig\小料称量\榄菊报表.糊化机报表.xml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>