add - 设备细节画面添加日罐压力显示,设备参数添加全部下传上传,下传送料请求和清报警按钮移动

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs

@@ -8,12 +8,12 @@ using Mesnac.Action.ChemicalWeighing.LjMetage;
 
 namespace Mesnac.Action.ChemicalWeighing.LjElectrical
 {
-    public class DownAction:ChemicalWeighingAction, IAction
+    public class DownAction : ChemicalWeighingAction, IAction
     {
-      
-        
+
+
         public static event EventHandler OnHandler;
-        
+
         private DbMCControl _materialGridControl = null; //物料列表控件
         private RuntimeParameter _runtime;
         public void Run(RuntimeParameter runtime)
@@ -24,32 +24,32 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical
                 this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ElectricalSetting")
                     .FirstOrDefault(); //获取物料数据控件
             this._materialGridControl = materialGridControl;
-         
-            
-            if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+
+
+            if (MessageBox.Show("确定下发变频参数到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)
             {
                 DoWord();
             };
-            
+
         }
-        
+
         private void DoWord()
         {
-            DataGridView gridView=_materialGridControl.BaseControl as DataGridView;
+            DataGridView gridView = _materialGridControl.BaseControl as DataGridView;
             var gridViewDataSource = gridView.DataSource as DataTable;
-           
+
             List<ElectricalView> lsView = new List<ElectricalView>();
 
             var dataRowCollection = gridViewDataSource.Rows;
             foreach (DataRow o in dataRowCollection)
             {
-                ElectricalView view =new  ElectricalView();
+                ElectricalView view = new ElectricalView();
                 view.Id = (int)o["Id"];
                 view.Name = o["Name"].ToString();
-                view.Speed =Convert.ToSingle(o["Speed"]);;
+                view.Speed = Convert.ToSingle(o["Speed"]); ;
                 lsView.Add(view);
             }
-            
+
             ElectricalPlc.DownToPlc(lsView);
         }
     }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs

@@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical
                     .FirstOrDefault(); //获取物料数据控件
             
             
-            if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+            if (MessageBox.Show("确定上传变频参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
             {
                 DoWord();
             };

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs

@@ -27,7 +27,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage
             this._materialGridControl = materialGridControl;
          
             
-            if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+            if (MessageBox.Show("确定下发称量频参数到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
             {
                
                 LoadingHelper.ShowLoadingScreen();

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs

@@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage
                     .FirstOrDefault(); //获取物料数据控件
             
             
-            if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+            if (MessageBox.Show("确定上传称量频参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
             {
                 LoadingHelper.ShowLoadingScreen();
                 var watchDog = LjHelp.WatchDog;

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs

@@ -27,7 +27,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
             this._materialGridControl = materialGridControl;
          
             
-            if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+            if (MessageBox.Show("确定下发压力参数到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
             {
                 DoWord();
             };

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs

@@ -21,7 +21,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
                     .FirstOrDefault(); //获取物料数据控件
             
             
-            if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+            if (MessageBox.Show("确定上传压力参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
             {
                 DoWord();
             };

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs

@@ -25,7 +25,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
             this._materialGridControl = materialGridControl;
 
 
-            if (MessageBox.Show("确定下发到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) ==
+            if (MessageBox.Show("确定下发比例阀参数到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) ==
                 DialogResult.OK)
             {
                 LoadingHelper.ShowLoadingScreen();

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs

@@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional
                     .FirstOrDefault(); //获取物料数据控件
             
             
-            if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+            if (MessageBox.Show("确定上传比例阀参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
             {
                 
                 LoadingHelper.ShowLoadingScreen();

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs

@@ -25,7 +25,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight
             this._materialGridControl = materialGridControl;
 
 
-            if (MessageBox.Show("确定下发到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) ==
+            if (MessageBox.Show("确定下发重量参数到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) ==
                 DialogResult.OK)
             {
                 DoWord();

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs

@@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight
                     .FirstOrDefault(); //获取物料数据控件
             
             
-            if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
+            if (MessageBox.Show("确定上传重量参数到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK)
             {
               
                 LoadingHelper.ShowLoadingScreen();

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs

@@ -220,6 +220,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public MCLabel LineKind6 { get; set; }
         public MCLabel LineKind7 { get; set; }
         public MCLabel LineKind8 { get; set; }
+        public MCLabel PresDaybin1 { get; set; }
+        public MCLabel PresDaybin2 { get; set; }
+        public MCLabel PresDaybin3 { get; set; }
+        public MCLabel PresDaybin4 { get; set; }
+        public MCLabel PresDaybin5 { get; set; }
+        public MCLabel PresDaybin6 { get; set; }
+        public MCLabel PresDaybin7 { get; set; }
+        public MCLabel PresDaybin8 { get; set; }
+        public MCLabel PresDaybin9 { get; set; }
+        public MCLabel PresDaybin10 { get; set; }
+        public MCLabel PresDaybin11 { get; set; }
+        public MCLabel PresDaybin12 { get; set; }
     }
 
     public class SwitchLightEntity

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs

@@ -123,6 +123,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public float DM2CSF01_Set { get; set; }
         public float DM2DSF01_Set { get; set; }
 
+        public float PresDaybin1_Set { get; set; }
+        public float PresDaybin2_Set { get; set; }
+        public float PresDaybin3_Set { get; set; }
+        public float PresDaybin4_Set { get; set; }
+        public float PresDaybin5_Set { get; set; }
+        public float PresDaybin6_Set { get; set; }
+        public float PresDaybin7_Set { get; set; }
+        public float PresDaybin8_Set { get; set; }
+        public float PresDaybin9_Set { get; set; }
+        public float PresDaybin10_Set { get; set; }
+        public float PresDaybin11_Set { get; set; }
+        public float PresDaybin12_Set { get; set; }
+
 
         public bool DM1ASF01_Set { get; set; }
         public bool DM1BSF01_Set { get; set; }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs

@@ -296,11 +296,11 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 ControlsHelper.SetMCLabel(LabelE.LineKind8, dict[8]);
             }
             ReadFlag += 1;
-            if(ReadFlag >= 30)
+            if (ReadFlag >= 30)
             {
                 ReadFlag = 0;
                 ReportReadDb.ReadFeededDry();
-                
+
             }
 
             var reachSingle = RgvPlcUtil.GetRGVAllError();
@@ -1109,7 +1109,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
 
 
 
-            
+
 
             if (DB2103.DM2DSF01.Running)
             {
@@ -1462,7 +1462,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 PlcReadTemp.ValueWeight2 = DB2107.Weter[3].FeedValue.ToString("0.#");
             }
 
-            
+
 
             if (PlcReadTemp.DM2CSF01L_Set)
             {
@@ -1485,7 +1485,18 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 PlcReadTemp.ValueWeight4 = DB2107.Weter[7].FeedValue.ToString("0.#");
             }
 
-
+            PlcReadTemp.PresDaybin1_Set  = DB2107.Pressure.PressDaybin_B1.ActualValue;
+            PlcReadTemp.PresDaybin2_Set  = DB2107.Pressure.PressDaybin_B2.ActualValue;
+            PlcReadTemp.PresDaybin3_Set  = DB2107.Pressure.PressDaybin_B3.ActualValue;
+            PlcReadTemp.PresDaybin4_Set  = DB2107.Pressure.PressDaybin_B4.ActualValue;
+            PlcReadTemp.PresDaybin5_Set  = DB2107.Pressure.PressDaybin_B5.ActualValue;
+            PlcReadTemp.PresDaybin6_Set  = DB2107.Pressure.PressDaybin_B6.ActualValue;
+            PlcReadTemp.PresDaybin7_Set  = DB2107.Pressure.PressDaybin_B7.ActualValue;
+            PlcReadTemp.PresDaybin8_Set  = DB2107.Pressure.PressDaybin_B8.ActualValue;
+            PlcReadTemp.PresDaybin9_Set  = DB2107.Pressure.PressDaybin_B9.ActualValue;
+            PlcReadTemp.PresDaybin10_Set  = DB2107.Pressure.PressDaybin_B10.ActualValue;
+            PlcReadTemp.PresDaybin11_Set  = DB2107.Pressure.PressDaybin_B11.ActualValue;
+            PlcReadTemp.PresDaybin12_Set  = DB2107.Pressure.PressDaybin_B12.ActualValue;
 
             ControlsHelper.SetMCLabel(LabelE.ValueWeight1, PlcReadTemp.ValueWeight1);
             ControlsHelper.SetMCLabel(LabelE.ValueWeight2, PlcReadTemp.ValueWeight2);
@@ -1572,6 +1583,19 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             ControlsHelper.SetMCLabel(LabelE.Hopper_3_ActWeight, (float)Math.Round(PlcReadTemp.Hopper_3_ActWeight_Set, 2));
             ControlsHelper.SetMCLabel(LabelE.Hopper_4_ActWeight, (float)Math.Round(PlcReadTemp.Hopper_4_ActWeight_Set, 2));
 
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin1, (float)Math.Round(PlcReadTemp.PresDaybin1_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin2, (float)Math.Round(PlcReadTemp.PresDaybin2_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin3, (float)Math.Round(PlcReadTemp.PresDaybin3_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin4, (float)Math.Round(PlcReadTemp.PresDaybin4_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin5, (float)Math.Round(PlcReadTemp.PresDaybin5_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin6, (float)Math.Round(PlcReadTemp.PresDaybin6_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin7, (float)Math.Round(PlcReadTemp.PresDaybin7_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin8, (float)Math.Round(PlcReadTemp.PresDaybin8_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin9, (float)Math.Round(PlcReadTemp.PresDaybin9_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin10, (float)Math.Round(PlcReadTemp.PresDaybin10_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin11, (float)Math.Round(PlcReadTemp.PresDaybin11_Set, 2));
+            ControlsHelper.SetMCLabel(LabelE.PresDaybin12, (float)Math.Round(PlcReadTemp.PresDaybin12_Set, 2));
+
 
             ControlsHelper.SetJzf(JzfE.AS1BLT01, PlcReadTemp.AS1BLT01_Set);
             ControlsHelper.SetJzf(JzfE.AS1BLT02, PlcReadTemp.AS1BLT02_Set);

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

@@ -555,6 +555,8 @@
     <Compile Include="ManualControl\ForceWaterControl.cs" />
     <Compile Include="ManualControl\InitAction.cs" />
     <Compile Include="ManualControl\Entity\ManualControlSettingEntity.cs" />
+    <Compile Include="OliveEQSetting\DownloadAction.cs" />
+    <Compile Include="OliveEQSetting\UploadAction.cs" />
     <Compile Include="Report\Entity\LjLogEntity.cs" />
     <Compile Include="Report\LjLogControl.cs" />
     <Compile Include="ManualControl\ManualControlAction.cs" />

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/DownloadAction.cs

@@ -0,0 +1,28 @@
+using Mesnac.Action.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting
+{
+    public class DownloadAction : ChemicalWeighingAction, IAction
+    {
+        LjElectrical.DownAction DownActionElectrical = new LjElectrical.DownAction();
+        LjMetage.DownAction DownActionMetage = new LjMetage.DownAction();
+        LjPressure.DownAction DownActionPressure = new LjPressure.DownAction();
+        LjProportional.DownAction DownActionProportional = new LjProportional.DownAction();
+        LjWeight.DownAction DownActionWeight = new LjWeight.DownAction();
+
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime);
+            DownActionElectrical.Run(runtime);
+            DownActionMetage.Run(runtime);
+            DownActionPressure.Run(runtime);
+            DownActionProportional.Run(runtime);
+            DownActionWeight.Run(runtime);
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/UploadAction.cs

@@ -0,0 +1,28 @@
+using Mesnac.Action.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting
+{
+    public class UploadAction : ChemicalWeighingAction, IAction
+    {
+        LjElectrical.UpAction UpActionElectrical = new LjElectrical.UpAction();
+        LjMetage.UpAction UpActionMetage = new LjMetage.UpAction();
+        LjPressure.UpAction UpActionPressure = new LjPressure.UpAction();
+        LjProportional.UpAction UpActionProportional = new LjProportional.UpAction();
+        LjWeight.UpAction UpActionWeight = new LjWeight.UpAction();
+
+        public void Run(RuntimeParameter runtime)
+        {
+            base.RunIni(runtime);
+            UpActionElectrical.Run(runtime);
+            UpActionMetage.Run(runtime);
+            UpActionPressure.Run(runtime);
+            UpActionProportional.Run(runtime);
+            UpActionWeight.Run(runtime);
+        }
+    }
+}

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/LjLogReport.cs

@@ -1,13 +1,21 @@
-using DevExpress.XtraExport.Helpers;
+using DataBlockHelper;
+using DevExpress.XtraExport.Helpers;
 using DevExpress.XtraRichEdit.Model;
+using ICSharpCode.Core;
 using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.InterfaceDocking;
+using Mesnac.Action.ChemicalWeighing.InterfaceDocking.DockingEntity;
+using Mesnac.Controls.ChemicalWeighing;
 using Mesnac.Controls.Default;
+using Mesnac.Core.Service;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -21,6 +29,17 @@ namespace Mesnac.Action.ChemicalWeighing.Report
         MCButton ManualControl;
         MCButton Refresh;
         MCButton SelectByText;
+        MCButton EliAlarms;
+        MCButton DownloadRequest;
+
+        //HslSwitch HslSwitch1;
+        //HslSwitch HslSwitch2;
+        //HslSwitch HslSwitch3;
+        //HslSwitch HslSwitch4;
+        //HslSwitch HslSwitch5;
+        //HslSwitch HslSwitch6;
+        //HslSwitch HslSwitch7;
+        //HslSwitch HslSwitch8;
 
         MCTextBox SelectText;
 
@@ -43,11 +62,21 @@ namespace Mesnac.Action.ChemicalWeighing.Report
             ManualControl = control.FirstOrDefault(x => x != null && x.Name == "ManualControl") as MCButton;
             Refresh = control.FirstOrDefault(x => x != null && x.Name == "Refresh") as MCButton;
             SelectByText = control.FirstOrDefault(x => x != null && x.Name == "SelectByText") as MCButton;
+            EliAlarms = control.FirstOrDefault(x => x != null && x.Name == "EliAlarms") as MCButton;
+            DownloadRequest = control.FirstOrDefault(x => x != null && x.Name == "DownloadRequest") as MCButton;
             StartDate = control.FirstOrDefault(x => x != null && x.Name == "StartDate") as MCDateTimePicker;
             EndDate = control.FirstOrDefault(x => x != null && x.Name == "EndDate") as MCDateTimePicker;
             LogForm = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ManualLogGridView1").FirstOrDefault();
             SelectText = control.FirstOrDefault(x => x != null && x.Name == "SelectText") as MCTextBox;
             Line = control.FirstOrDefault(x => x != null && x.Name == "Line") as MCCombobox;
+            //HslSwitch1 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch1") as HslSwitch;
+            //HslSwitch2 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch2") as HslSwitch;
+            //HslSwitch3 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch3") as HslSwitch;
+            //HslSwitch4 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch4") as HslSwitch;
+            //HslSwitch5 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch5") as HslSwitch;
+            //HslSwitch6 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch6") as HslSwitch;
+            //HslSwitch7 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch7") as HslSwitch;
+            //HslSwitch8 = control.FirstOrDefault(x => x != null && x.Name == "HslSwitch8") as HslSwitch;
 
             if (LogForm != null)
             {
@@ -81,38 +110,136 @@ namespace Mesnac.Action.ChemicalWeighing.Report
             ManualControl.Click += ManualControlSelect;
             Refresh.Click += RefreshAction;
             SelectByText.Click += SelectByTextAction;
+            EliAlarms.Click += EliAlarmsClick;
+            DownloadRequest.Click += RequestDownloadClick;
+        }
+
+        /// <summary>
+        /// 下发送料请求按钮点击
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void RequestDownloadClick(object sender, EventArgs e)
+        {
+                bool mixok1 = PlcConnect.Instance.ReadBool("DB3000.0.0").Content;
+                Time(1, mixok1 ? 1 : 0);
+                bool mixok2 = PlcConnect.Instance.ReadBool("DB3000.0.1").Content;
+                Time(2, mixok2 ? 1 : 0);
+                bool mixok3 = PlcConnect.Instance.ReadBool("DB3000.0.2").Content;
+                Time(3, mixok3 ? 1 : 0);
+                bool mixok4 = PlcConnect.Instance.ReadBool("DB3000.0.3").Content;
+                Time(4, mixok4 ? 1 : 0);
+                bool mixok5 = PlcConnect.Instance.ReadBool("DB3000.0.4").Content;
+                Time(5, mixok5 ? 1 : 0);
+                bool mixok6 = PlcConnect.Instance.ReadBool("DB3000.0.5").Content;
+                Time(6, mixok6 ? 1 : 0);
+                bool mixok7 = PlcConnect.Instance.ReadBool("DB3000.0.6").Content;
+                Trace.WriteLine("7号信号:" + mixok7);
+                Time(7, mixok7 ? 1 : 0);
+                bool mixok8 = PlcConnect.Instance.ReadBool("DB3000.0.7").Content;
+                Trace.WriteLine("8号信号:" + mixok8);
+                Time(8, mixok8 ? 1 : 0);
+        }
+
+        /// <summary>
+        /// 下发接料请求
+        /// </summary>
+        /// <param name="deviceNo"></param>
+        /// <param name="statu"></param>
+        private void Time(int deviceNo, int statu)
+        {
+            TankIsDischargedSyncEntity tankIsDischargedSyncEntity = new TankIsDischargedSyncEntity()
+            {
+                reqCode = System.Guid.NewGuid().ToString(),
+                reqTime = DateTime.Now,
+                deviceNo = deviceNo.ToString(),
+                state = statu.ToString(),
+            };
+            //即使网络不同 也不会影响上位机的使用
+            ThreadPool.QueueUserWorkItem(delegate
+            {
+                HttpResponse httpResponse = new HttpResponse();
+                string returnTest = httpResponse.PostResponse(tankIsDischargedSyncEntity);
+                MesnacServiceManager.Instance.LoggingService.Info($"湿混机{deviceNo}返回数据" + returnTest);
+            });
+        }
+
+        /// <summary>
+        /// 消除报警按钮点击
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void EliAlarmsClick(object sender, EventArgs e)
+        {
+            PlcConnect.Instance.Write("DB2107.10.7", true);
+            Thread.Sleep(2000);
+            PlcConnect.Instance.Write("DB2107.10.7", false);
         }
 
+        /// <summary>
+        /// 按时间查询日志
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void SelectByTime(object sender, EventArgs e)
         {
             SetForm(StartDate.Value.Date.ToString("yyyy-MM-dd"), EndDate.Value.Date.ToString("yyyy-MM-dd"));
         }
 
+        /// <summary>
+        /// 水称日志查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void WaterSetSelect(object sender, EventArgs e)
         {
             SetForm("水", Convert.ToInt32(Line.MCValue.ToString()));
         }
 
+        /// <summary>
+        /// 螺旋日志查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void SpiralSetSelect(object sender, EventArgs e)
         {
             SetForm("螺旋", Convert.ToInt32(Line.MCValue.ToString()));
         }
 
+        /// <summary>
+        /// 手动操作查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ManualControlSelect(object sender, EventArgs e)
         {
             SetForm("手动");
         }
 
+        /// <summary>
+        /// 刷新日志按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void RefreshAction(object sender, EventArgs e)
         {
             SetForm("");
         }
 
+        /// <summary>
+        /// 根据文本模糊查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void SelectByTextAction(object sender, EventArgs e)
         {
             SetForm(SelectText.MCValue.ToString());
         }
 
+        /// <summary>
+        /// 根据文本查询绑定控件2
+        /// </summary>
+        /// <param name="key">文本</param>
         private void SetForm(string key)
         {
             if (LogForm != null)
@@ -123,6 +250,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report
             }
         }
 
+        /// <summary>
+        /// 根据文本和设备编号查询绑定控件
+        /// </summary>
+        /// <param name="key">文本</param>
+        /// <param name="deviceNo">设备编号</param>
         private void SetForm(string key, int deviceNo)
         {
             if (LogForm != null)
@@ -133,6 +265,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report
             }
         }
 
+        /// <summary>
+        /// 根据起始时间查询绑定控件
+        /// </summary>
+        /// <param name="startTime">开始时间</param>
+        /// <param name="endTime">结束时间</param>
         private void SetForm(string startTime, string endTime)
         {
             if (LogForm != null)

Main/MCEdit/Data/EventConfig/小料称量/榄菊设备参数设定总览.xml

@@ -1,30 +1,48 @@
 <?xml version="1.0"?>
 <ActionService>
-    <Design>
-        
-        <Path path="榄菊设备参数设定总览">
-          
-            <Action action="936DAB90B564C27F0D6EBB2F89D86CA6">
-              <Caption>初始榄菊设备参数</Caption>
-              <Remark>初始榄菊设备参数</Remark>
-            </Action>
-            
-        </Path>
+  <Design>
+
+    <Path path="榄菊设备参数设定总览">
+
+      <Action action="936DAB90B564C27F0D6EBB2F89D86CA6">
+        <Caption>初始榄菊设备参数</Caption>
+        <Remark>初始榄菊设备参数</Remark>
+      </Action>
+      <Action action="B9472335A9FB460FA6DE03772CCE3616">
+        <Caption>数据全部上传</Caption>
+        <Remark>数据全部上传</Remark>
+      </Action>
+      <Action action="8EE2EE9DA17E408CB3C9D21CAC7062E6">
+        <Caption>数据全部下达</Caption>
+        <Remark>数据全部下达</Remark>
+      </Action>
+
+    </Path>
+  </Design>
+
+  <DesignToRuntime>
+    
+    <Design action="936DAB90B564C27F0D6EBB2F89D86CA6">
+      <Runtime action="EBFA9D921131FDBF119CEA4D5D2040AD"/>
+    </Design>
+    <Design action="B9472335A9FB460FA6DE03772CCE3616">
+      <Runtime action="D9F5E27E11F749A6931D9803882C78C7"/>
+    </Design>
+    <Design action="8EE2EE9DA17E408CB3C9D21CAC7062E6">
+      <Runtime action="8FFCE003FEC84EE98B87B2DD621FB2FB"/>
     </Design>
+    
+  </DesignToRuntime>
 
-    <DesignToRuntime>
-        <Design action="936DAB90B564C27F0D6EBB2F89D86CA6">
-          <Runtime action="EBFA9D921131FDBF119CEA4D5D2040AD"/>
-        </Design>
-        
-    </DesignToRuntime>
-
-    <Runtime>
-        <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
-          <Action action="EBFA9D921131FDBF119CEA4D5D2040AD" class="Mesnac.Action.ChemicalWeighing.OliveEQSetting.InItDbAction"/>
-           
-        </Import>
-    </Runtime>
+  <Runtime>
+    <Import assembly = "Data/Action/ChemicalWeighing/Mesnac.Action.ChemicalWeighing.dll">
+      
+      <Action action="EBFA9D921131FDBF119CEA4D5D2040AD" class="Mesnac.Action.ChemicalWeighing.OliveEQSetting.InItDbAction"/>
+      <Action action="D9F5E27E11F749A6931D9803882C78C7" class="Mesnac.Action.ChemicalWeighing.OliveEQSetting.UploadAction"/>
+      <Action action="8FFCE003FEC84EE98B87B2DD621FB2FB" class="Mesnac.Action.ChemicalWeighing.OliveEQSetting.DownloadAction"/>
+      
+    </Import>
+  </Runtime>
 </ActionService>
 
 

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

@@ -498,6 +498,56 @@
                   <Property name="TabIndex">25</Property>
                 </Object>
                 <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel17" children="Controls">
+                  <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AllDownload" children="Controls">
+                    <Property name="ClickActionList">
+                      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhFRTJFRTlEQTE3RTQwOENCM0M5RDIxQ0FDNzA2MkU2BgYAAAAS5pWw5o2u5YWo6YOo5LiL6L6+BgcAAAAS5pWw5o2u5YWo6YOo5LiL6L6+Cw==</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="Font">宋体, 12pt, style=Bold</Property>
+                    <Property name="Location">509, 7</Property>
+                    <Property name="Name">AllDownload</Property>
+                    <Property name="Size">110, 52</Property>
+                    <Property name="TabIndex">13</Property>
+                  </Object>
+                  <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AllUpload" children="Controls">
+                    <Property name="ClickActionList">
+                      <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEI5NDcyMzM1QTlGQjQ2MEZBNkRFMDM3NzJDQ0UzNjE2BgYAAAAS5pWw5o2u5YWo6YOo5LiK5LygBgcAAAAS5pWw5o2u5YWo6YOo5LiK5LygCw==</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="Font">宋体, 12pt, style=Bold</Property>
+                    <Property name="Location">384, 7</Property>
+                    <Property name="Name">AllUpload</Property>
+                    <Property name="Size">110, 52</Property>
+                    <Property name="TabIndex">12</Property>
+                  </Object>
                   <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton25" children="Controls">
                     <Property name="ClickActionList">
                       <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCRjBEM0RDRTU2M0I0RTY4OUI4MTVFMzNEMDlGOUFFBgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw==</Binary>

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

@@ -1,5 +1,95 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjLogForm" children="Controls">
+    <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DownloadRequest" children="Controls">
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw==</Binary>
+      </Property>
+      <Property name="MCKey">DownloadRequest</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="MCPurview">False</Property>
+      <Property name="Format" />
+      <Property name="TextName" />
+      <Property name="NewFillColor">Red</Property>
+      <Property name="OldFillColor">DarkGray</Property>
+      <Property name="Text">下发送料请求</Property>
+      <Property name="Font">宋体, 12pt</Property>
+      <Property name="Location">63, 409</Property>
+      <Property name="Name">DownloadRequest</Property>
+      <Property name="Size">148, 44</Property>
+      <Property name="TabIndex">49</Property>
+    </Object>
+    <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="EliAlarms" children="Controls">
+      <Property name="ClickActionList">
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw==</Binary>
+      </Property>
+      <Property name="MCKey">EliAlarms</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="MCPurview">False</Property>
+      <Property name="Format" />
+      <Property name="TextName" />
+      <Property name="NewFillColor">Red</Property>
+      <Property name="OldFillColor">DarkGray</Property>
+      <Property name="Text">消除报警</Property>
+      <Property name="Font">宋体, 12pt</Property>
+      <Property name="Location">63, 350</Property>
+      <Property name="Name">EliAlarms</Property>
+      <Property name="Size">148, 44</Property>
+      <Property name="TabIndex">48</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch2" children="Controls">
+      <Property name="Location">142, 476</Property>
+      <Property name="Name">HslSwitch2</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch8" children="Controls">
+      <Property name="Location">142, 731</Property>
+      <Property name="Name">HslSwitch8</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch7" children="Controls">
+      <Property name="Location">51, 731</Property>
+      <Property name="Name">HslSwitch7</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch6" children="Controls">
+      <Property name="Location">141, 646</Property>
+      <Property name="Name">HslSwitch6</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch5" children="Controls">
+      <Property name="Location">51, 646</Property>
+      <Property name="Name">HslSwitch5</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch4" children="Controls">
+      <Property name="Location">141, 561</Property>
+      <Property name="Name">HslSwitch4</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch3" children="Controls">
+      <Property name="Location">51, 561</Property>
+      <Property name="Name">HslSwitch3</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
+    <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch1" children="Controls">
+      <Property name="Location">51, 476</Property>
+      <Property name="Name">HslSwitch1</Property>
+      <Property name="Size">73, 79</Property>
+    </Object>
     <Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LogForm" children="Controls">
       <Property name="DisplayAllColumn">False</Property>
       <Property name="DgvColumn">
@@ -27,7 +117,7 @@
       <Property name="MCEnabled">True</Property>
       <Property name="AutoGenerateColumns">False</Property>
       <Property name="MultiSelect">False</Property>
-      <Property name="Location">310, 12</Property>
+      <Property name="Location">273, 12</Property>
       <Property name="Name">LogForm</Property>
       <Property name="Size">533, 826</Property>
       <Property name="TabIndex">13</Property>
@@ -113,7 +203,7 @@
         </Object>
         <Property name="TabStop">False</Property>
         <Property name="Text">查询细分</Property>
-        <Property name="Location">25, 176</Property>
+        <Property name="Location">6, 165</Property>
         <Property name="Name">GroupBox2147483645</Property>
         <Property name="Size">122, 153</Property>
         <Property name="TabIndex">21</Property>
@@ -132,7 +222,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">224, 224, 224</Property>
-        <Property name="Location">25, 162</Property>
+        <Property name="Location">6, 151</Property>
         <Property name="Name">SpecialLabelBlue1</Property>
         <Property name="Size">244, 1</Property>
       </Object>
@@ -156,7 +246,7 @@
         <Property name="OldFillColor">DarkGray</Property>
         <Property name="Text">手动操作查询</Property>
         <Property name="Font">宋体, 12pt</Property>
-        <Property name="Location">153, 180</Property>
+        <Property name="Location">134, 169</Property>
         <Property name="Name">ManualControl</Property>
         <Property name="Size">116, 47</Property>
         <Property name="TabIndex">14</Property>
@@ -179,7 +269,7 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Location">25, 112</Property>
+        <Property name="Location">12, 101</Property>
         <Property name="Name">SelectText</Property>
         <Property name="Size">110, 21</Property>
         <Property name="TabIndex">16</Property>
@@ -204,7 +294,7 @@
         <Property name="OldFillColor">DarkGray</Property>
         <Property name="Text">日志查询</Property>
         <Property name="Font">宋体, 12pt</Property>
-        <Property name="Location">153, 97</Property>
+        <Property name="Location">134, 86</Property>
         <Property name="Name">SelectByText</Property>
         <Property name="Size">116, 47</Property>
         <Property name="TabIndex">15</Property>
@@ -229,7 +319,7 @@
         <Property name="OldFillColor">DarkGray</Property>
         <Property name="Text">刷新</Property>
         <Property name="Font">宋体, 20pt</Property>
-        <Property name="Location">153, 233</Property>
+        <Property name="Location">134, 222</Property>
         <Property name="Name">Refresh</Property>
         <Property name="Size">116, 96</Property>
         <Property name="TabIndex">13</Property>
@@ -248,7 +338,7 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="Format">Short</Property>
-        <Property name="Location">25, 58</Property>
+        <Property name="Location">12, 47</Property>
         <Property name="Name">EndDate</Property>
         <Property name="Size">110, 21</Property>
         <Property name="TabIndex">10</Property>
@@ -267,7 +357,7 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="Format">Short</Property>
-        <Property name="Location">25, 31</Property>
+        <Property name="Location">12, 20</Property>
         <Property name="Name">StartDate</Property>
         <Property name="Size">110, 21</Property>
         <Property name="TabIndex">9</Property>
@@ -292,7 +382,7 @@
         <Property name="OldFillColor">DarkGray</Property>
         <Property name="Text">范围查询</Property>
         <Property name="Font">宋体, 12pt</Property>
-        <Property name="Location">153, 31</Property>
+        <Property name="Location">134, 20</Property>
         <Property name="Name">SelectButton</Property>
         <Property name="Size">116, 48</Property>
         <Property name="TabIndex">8</Property>
@@ -302,7 +392,7 @@
       <Property name="Location">12, 12</Property>
       <Property name="Name">
       </Property>
-      <Property name="Size">292, 350</Property>
+      <Property name="Size">255, 323</Property>
       <Property name="TabIndex">11</Property>
     </Object>
     <Property name="LoadActionList">
@@ -321,7 +411,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">871, 889</Property>
+    <Property name="Size">834, 889</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">榄菊生产日志</Property>
     <Property name="WindowState">Normal</Property>

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

@@ -1,6 +1,246 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MainDetail" children="Controls">
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin12" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1840, 177</Property>
+        <Property name="Name">PresDaybin12</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin10" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1651, 177</Property>
+        <Property name="Name">PresDaybin10</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin11" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1735, 177</Property>
+        <Property name="Name">PresDaybin11</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin9" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1527, 177</Property>
+        <Property name="Name">PresDaybin9</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin7" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1337, 177</Property>
+        <Property name="Name">PresDaybin7</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin8" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1421, 177</Property>
+        <Property name="Name">PresDaybin8</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin6" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1283, 177</Property>
+        <Property name="Name">PresDaybin6</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin4" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1093, 177</Property>
+        <Property name="Name">PresDaybin4</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin5" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">1177, 177</Property>
+        <Property name="Name">PresDaybin5</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin3" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">972, 176</Property>
+        <Property name="Name">PresDaybin3</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin1" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">782, 176</Property>
+        <Property name="Name">PresDaybin1</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PresDaybin2" 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">0.00</Property>
+        <Property name="ForeColor">ButtonHighlight</Property>
+        <Property name="Location">866, 176</Property>
+        <Property name="Name">PresDaybin2</Property>
+        <Property name="Size">29, 12</Property>
+      </Object>
       <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel238" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -7928,7 +8168,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">1657, 117</Property>
+        <Property name="Location">1668, 117</Property>
         <Property name="Name">ThreeWayValve14</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -8275,7 +8515,7 @@
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl19" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">1661, 191</Property>
+        <Property name="Location">1672, 191</Property>
         <Property name="Name">PControl19</Property>
         <Property name="Size">10, 15</Property>
       </Object>
@@ -8297,14 +8537,14 @@
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl20" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">1851, 189</Property>
+        <Property name="Location">1858, 189</Property>
         <Property name="Name">PControl20</Property>
         <Property name="Size">10, 15</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl21" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">1765, 190</Property>
+        <Property name="Location">1767, 190</Property>
         <Property name="Name">PControl21</Property>
         <Property name="Size">10, 15</Property>
       </Object>
@@ -8319,7 +8559,7 @@
         <Property name="AlarmValue" />
         <Property name="StatusName" />
         <Property name="Status">zsTurnOff</Property>
-        <Property name="Location">1778, 175</Property>
+        <Property name="Location">1781, 175</Property>
         <Property name="Name">DM1KDF01</Property>
         <Property name="Size">17, 15</Property>
       </Object>
@@ -8380,9 +8620,9 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1758, 71</Property>
+        <Property name="Location">1764, 71</Property>
         <Property name="Name">SpecialLabelBlue361</Property>
-        <Property name="Size">3, 129</Property>
+        <Property name="Size">3, 133</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue360" children="Controls">
         <Property name="Format" />
@@ -8398,7 +8638,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1862, 120</Property>
+        <Property name="Location">1869, 120</Property>
         <Property name="Name">SpecialLabelBlue360</Property>
         <Property name="Size">3, 83</Property>
       </Object>
@@ -8416,7 +8656,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1671, 121</Property>
+        <Property name="Location">1682, 121</Property>
         <Property name="Name">SpecialLabelBlue359</Property>
         <Property name="Size">3, 82</Property>
       </Object>
@@ -9548,14 +9788,14 @@
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl13" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">1297, 192</Property>
+        <Property name="Location">1304, 192</Property>
         <Property name="Name">PControl13</Property>
         <Property name="Size">10, 15</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl12" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">1347, 192</Property>
+        <Property name="Location">1357, 192</Property>
         <Property name="Name">PControl12</Property>
         <Property name="Size">10, 15</Property>
       </Object>
@@ -9577,7 +9817,7 @@
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl11" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">1538, 190</Property>
+        <Property name="Location">1545, 190</Property>
         <Property name="Name">PControl11</Property>
         <Property name="Size">10, 15</Property>
       </Object>
@@ -9599,7 +9839,7 @@
         <Property name="AlarmValue" />
         <Property name="StatusName" />
         <Property name="Status">zsTurnOff</Property>
-        <Property name="Location">1465, 175</Property>
+        <Property name="Location">1468, 175</Property>
         <Property name="Name">DM1HDF01</Property>
         <Property name="Size">17, 15</Property>
       </Object>
@@ -9658,7 +9898,7 @@
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl8" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">1106, 191</Property>
+        <Property name="Location">1115, 191</Property>
         <Property name="Name">PControl8</Property>
         <Property name="Size">10, 15</Property>
       </Object>
@@ -9688,7 +9928,7 @@
         <Property name="AlarmValue" />
         <Property name="StatusName" />
         <Property name="Status">zsTurnOff</Property>
-        <Property name="Location">912, 177</Property>
+        <Property name="Location">916, 177</Property>
         <Property name="Name">DM1BDF01</Property>
         <Property name="Size">17, 15</Property>
       </Object>
@@ -9717,7 +9957,7 @@
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl7" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">992, 190</Property>
+        <Property name="Location">993, 190</Property>
         <Property name="Name">PControl7</Property>
         <Property name="Size">10, 15</Property>
       </Object>
@@ -9731,7 +9971,7 @@
       <Object type="Mesnac.Controls.ChemicalWeighing.PControl, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="PControl5" children="Controls">
         <Property name="StatusName" />
         <Property name="Status">TurnOn</Property>
-        <Property name="Location">800, 190</Property>
+        <Property name="Location">801, 190</Property>
         <Property name="Name">PControl5</Property>
         <Property name="Size">10, 15</Property>
       </Object>
@@ -10477,7 +10717,7 @@
         <Property name="BackColor">MintCream</Property>
         <Property name="Location">1452, 78</Property>
         <Property name="Name">SpecialLabelBlue495</Property>
-        <Property name="Size">3, 122</Property>
+        <Property name="Size">3, 126</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV2PCP12" children="Controls">
         <Property name="ZLTName" />
@@ -10502,7 +10742,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1549, 125</Property>
+        <Property name="Location">1556, 125</Property>
         <Property name="Name">SpecialLabelBlue496</Property>
         <Property name="Size">3, 78</Property>
       </Object>
@@ -10511,7 +10751,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">1537, 116</Property>
+        <Property name="Location">1544, 116</Property>
         <Property name="Name">DV2PCP13</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -10529,16 +10769,16 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1358, 125</Property>
+        <Property name="Location">1368, 125</Property>
         <Property name="Name">SpecialLabelBlue497</Property>
-        <Property name="Size">3, 78</Property>
+        <Property name="Size">3, 81</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV2PCP10" children="Controls">
         <Property name="ZLTName" />
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">1344, 118</Property>
+        <Property name="Location">1354, 118</Property>
         <Property name="Name">DV2PCP10</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -11030,7 +11270,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1308, 152</Property>
+        <Property name="Location">1315, 152</Property>
         <Property name="Name">SpecialLabelBlue517</Property>
         <Property name="Size">3, 53</Property>
       </Object>
@@ -11048,7 +11288,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1117, 156</Property>
+        <Property name="Location">1126, 156</Property>
         <Property name="Name">SpecialLabelBlue518</Property>
         <Property name="Size">3, 53</Property>
       </Object>
@@ -11057,7 +11297,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">1104, 148</Property>
+        <Property name="Location">1113, 148</Property>
         <Property name="Name">DV2PCP09</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -11082,7 +11322,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">MintCream</Property>
-        <Property name="Location">1003, 156</Property>
+        <Property name="Location">1004, 156</Property>
         <Property name="Name">SpecialLabelBlue519</Property>
         <Property name="Size">3, 53</Property>
       </Object>
@@ -11091,7 +11331,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">990, 148</Property>
+        <Property name="Location">991, 148</Property>
         <Property name="Name">DV2PCP08</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -11111,7 +11351,7 @@
         <Property name="BackColor">MintCream</Property>
         <Property name="Location">802, 150</Property>
         <Property name="Name">SpecialLabelBlue520</Property>
-        <Property name="Size">508, 3</Property>
+        <Property name="Size">516, 3</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue521" children="Controls">
         <Property name="Format" />
@@ -11698,7 +11938,7 @@
         <Property name="BackColor">MintCream</Property>
         <Property name="Location">736, 120</Property>
         <Property name="Name">SpecialLabelBlue541</Property>
-        <Property name="Size">1129, 3</Property>
+        <Property name="Size">1136, 3</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue544" children="Controls">
         <Property name="Format" />
@@ -11734,7 +11974,7 @@
         <Property name="BackColor">MintCream</Property>
         <Property name="Location">758, 71</Property>
         <Property name="Name">SpecialLabelBlue543</Property>
-        <Property name="Size">1003, 3</Property>
+        <Property name="Size">1009, 3</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue547" children="Controls">
         <Property name="Format" />

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

@@ -19,7 +19,7 @@
       <Property name="NewFillColor">Red</Property>
       <Property name="OldFillColor">DarkGray</Property>
       <Property name="Text">下发送料请求</Property>
-      <Property name="Location">702, 356</Property>
+      <Property name="Location">702, 381</Property>
       <Property name="Name">DownloadRequest</Property>
       <Property name="Size">148, 44</Property>
       <Property name="TabIndex">39</Property>
@@ -43,7 +43,7 @@
       <Property name="NewFillColor">Red</Property>
       <Property name="OldFillColor">DarkGray</Property>
       <Property name="Text">消除报警</Property>
-      <Property name="Location">702, 276</Property>
+      <Property name="Location">702, 331</Property>
       <Property name="Name">EliAlarms</Property>
       <Property name="Size">148, 44</Property>
       <Property name="TabIndex">30</Property>