diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs
index 7866553..e15fcd7 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs
@@ -27,7 +27,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
///
/// 数据库code
- ///
+ /// x.Type == type && x.DeviceId == deviceId)
.ToList();
}
-
-
-
+
+
+ private static void ComboboxDBHelper()
+ {
+
+ }
+
}
}
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
index f687c59..0400bce 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
@@ -27,7 +27,6 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
private List McControls;
RuntimeParameter _runtime;
GelerWeterControlsEntity ControlsEntity = new GelerWeterControlsEntity();
- public static int choose;
public void Run(RuntimeParameter runtime)
{
@@ -39,102 +38,21 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
ControlImport();
- BottomSelect(runtime);
- }
-
- ///
- /// 单选选择
- ///
- /// 返回单选的产线号 如果未选择返回0
- private int SingleSelect()
- {
- if(Convert.ToBoolean(ControlsEntity.Line1.MCValue) == true)
+ try
{
- return 1;
+ BottomSelect(runtime);
}
- else if (Convert.ToBoolean(ControlsEntity.Line2.MCValue) == true)
+ catch(Exception e)
{
- return 2;
- }
- else if (Convert.ToBoolean(ControlsEntity.Line3.MCValue) == true)
- {
- return 3;
- }
- else if (Convert.ToBoolean(ControlsEntity.Line4.MCValue) == true)
- {
- return 4;
+ MessageBox.Show("请检查输入内容格式是否正确！");
}
- else if (Convert.ToBoolean(ControlsEntity.Line5.MCValue) == true)
- {
- return 5;
- }
- else if (Convert.ToBoolean(ControlsEntity.Line6.MCValue) == true)
- {
- return 6;
- }
- else if (Convert.ToBoolean(ControlsEntity.Line7.MCValue) == true)
- {
- return 7;
- }
- else if (Convert.ToBoolean(ControlsEntity.Line8.MCValue) == true)
- {
- return 8;
- }
- else
- {
- return 0;
- }
- }
-
- ///
- /// 控件导入
- ///
- private void ControlImport()
- {
- ControlsEntity.Line1 = GetBaseControl("Line1");
- ControlsEntity.Line2 = GetBaseControl("Line2");
- ControlsEntity.Line3 = GetBaseControl("Line3");
- ControlsEntity.Line4 = GetBaseControl("Line4");
- ControlsEntity.Line5 = GetBaseControl("Line5");
- ControlsEntity.Line6 = GetBaseControl("Line6");
- ControlsEntity.Line7 = GetBaseControl("Line7");
- ControlsEntity.Line8 = GetBaseControl("Line8");
-
- ControlsEntity.ChooseMaterial1 = GetComboBoxControl("ChooseMaterial1");
- ControlsEntity.ChooseMaterial2 = GetComboBoxControl("ChooseMaterial2");
-
- ControlsEntity.MaterialWeight1 = GetBaseControl("MaterialWeight1");
- ControlsEntity.MaterialWeight2 = GetBaseControl("MaterialWeight2");
- ControlsEntity.MaterialTolerance1 = GetBaseControl("MaterialTolerance1");
- ControlsEntity.MaterialTolerance2 = GetBaseControl("MaterialTolerance2");
- ControlsEntity.GelSpeedSet = GetBaseControl("GelSpeedSet");
- ControlsEntity.GelPosTimeA = GetBaseControl("GelPosTimeA");
- ControlsEntity.GelNagTimeB = GetBaseControl("GelNagTimeB");
- ControlsEntity.GelPosTimeC = GetBaseControl("GelPosTimeC");
- ControlsEntity.GelWaterTime = GetBaseControl("GelWaterTime");
- ControlsEntity.GelWaitTime = GetBaseControl("GelWaitTime");
- ControlsEntity.GelCloseHeatTime = GetBaseControl("GelCloseHeatTime");
- ControlsEntity.GelOutDelayTime = GetBaseControl("GelOutDelayTime");
- ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight");
- ControlsEntity.WetMixTime = GetBaseControl("WetMixTime");
- ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime");
- ControlsEntity.ManualTolerance = GetBaseControl("ManualTolerance");
- ControlsEntity.ManualWeight = GetBaseControl("ManualWeight");
-
- ControlsEntity.WetManualControl = GetButtonControl("WetManualControl");
- ControlsEntity.Download = GetButtonControl("Download");
- ControlsEntity.LineStart = GetButtonControl("LineStart");
- ControlsEntity.LineStop = GetButtonControl("LineStop");
- ControlsEntity.GelManualPowder = GetButtonControl("GelManualPowder");
- ControlsEntity.GelManualColdWater = GetButtonControl("GelManualColdWater");
- ControlsEntity.GelManualHotWater = GetButtonControl("GelManualHotWater");
- ControlsEntity.WetManualGel = GetButtonControl("WetManualGel");
}
private void BottomSelect(RuntimeParameter runtime)
{
-
+
+ #region 自动参数下传
if (ControlsEntity.Download == runtime.Sender)
{
@@ -314,9 +232,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
MessageBox.Show("请选择一条产线！");
return;
}
-
}
+ #endregion
+
#region 手动控制
if (ControlsEntity.GelManualPowder == runtime.Sender)
@@ -325,6 +244,45 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
{
return;
}
+
+ bool isReady;
+
+ switch (SingleSelect())
+ {
+ case 1:
+ isReady = DB2105WriteHelper.WriteG1Pd();
+ break;
+ case 2:
+ isReady = DB2105WriteHelper.WriteG2Pd();
+ break;
+ case 3:
+ isReady = DB2105WriteHelper.WriteG3Pd();
+ break;
+ case 4:
+ isReady = DB2105WriteHelper.WriteG4Pd();
+ break;
+ case 5:
+ isReady = DB2105WriteHelper.WriteG5Pd();
+ break;
+ case 6:
+ isReady = DB2105WriteHelper.WriteG6Pd();
+ break;
+ case 7:
+ isReady = DB2105WriteHelper.WriteG7Pd();
+ break;
+ case 8:
+ isReady = DB2105WriteHelper.WriteG8Pd();
+ break;
+ default:
+ isReady = true;
+ MessageBox.Show("当前未选择产线！");
+ return;
+ }
+
+ if (!isReady)
+ {
+ MessageBox.Show("信号未准备好！");
+ }
}
if (ControlsEntity.GelManualColdWater == runtime.Sender)
@@ -333,6 +291,45 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
{
return;
}
+ bool isReady;
+
+ switch (SingleSelect())
+ {
+ case 1:
+ isReady = DB2105WriteHelper.WriteG1Cw();
+ break;
+ case 2:
+ isReady = DB2105WriteHelper.WriteG2Cw();
+ break;
+ case 3:
+ isReady = DB2105WriteHelper.WriteG3Cw();
+ break;
+ case 4:
+ isReady = DB2105WriteHelper.WriteG4Cw();
+ break;
+ case 5:
+ isReady = DB2105WriteHelper.WriteG5Cw();
+ break;
+ case 6:
+ isReady = DB2105WriteHelper.WriteG6Cw();
+ break;
+ case 7:
+ isReady = DB2105WriteHelper.WriteG7Cw();
+ break;
+ case 8:
+ isReady = DB2105WriteHelper.WriteG8Cw();
+ break;
+ default:
+ isReady = true;
+ MessageBox.Show("当前未选择产线！");
+ return;
+ }
+
+ if (!isReady)
+ {
+ MessageBox.Show("信号未准备好！");
+ }
+
}
if (ControlsEntity.GelManualHotWater == runtime.Sender)
@@ -341,6 +338,45 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
{
return;
}
+
+ bool isReady;
+
+ switch (SingleSelect())
+ {
+ case 1:
+ isReady = DB2105WriteHelper.WriteG1Hw();
+ break;
+ case 2:
+ isReady = DB2105WriteHelper.WriteG2Hw();
+ break;
+ case 3:
+ isReady = DB2105WriteHelper.WriteG3Hw();
+ break;
+ case 4:
+ isReady = DB2105WriteHelper.WriteG4Hw();
+ break;
+ case 5:
+ isReady = DB2105WriteHelper.WriteG5Hw();
+ break;
+ case 6:
+ isReady = DB2105WriteHelper.WriteG6Hw();
+ break;
+ case 7:
+ isReady = DB2105WriteHelper.WriteG7Hw();
+ break;
+ case 8:
+ isReady = DB2105WriteHelper.WriteG8Hw();
+ break;
+ default:
+ isReady = true;
+ MessageBox.Show("当前未选择产线！");
+ return;
+ }
+
+ if (!isReady)
+ {
+ MessageBox.Show("信号未准备好！");
+ }
}
if (ControlsEntity.WetManualGel == runtime.Sender)
@@ -349,6 +385,45 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
{
return;
}
+
+ bool isReady;
+
+ switch (SingleSelect())
+ {
+ case 1:
+ isReady = DB2105WriteHelper.WriteM1();
+ break;
+ case 2:
+ isReady = DB2105WriteHelper.WriteM2();
+ break;
+ case 3:
+ isReady = DB2105WriteHelper.WriteM3();
+ break;
+ case 4:
+ isReady = DB2105WriteHelper.WriteM4();
+ break;
+ case 5:
+ isReady = DB2105WriteHelper.WriteM5();
+ break;
+ case 6:
+ isReady = DB2105WriteHelper.WriteM6();
+ break;
+ case 7:
+ isReady = DB2105WriteHelper.WriteM7();
+ break;
+ case 8:
+ isReady = DB2105WriteHelper.WriteM8();
+ break;
+ default:
+ isReady = false;
+ MessageBox.Show("当前未选择产线！");
+ return;
+ }
+
+ if (!isReady)
+ {
+ MessageBox.Show("信号未准备好！");
+ }
}
if (ControlsEntity.WetManualControl == runtime.Sender)
@@ -363,7 +438,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
Toterance = Convert.ToSingle(ControlsEntity.ManualWeight.MCValue.ToString())
};
- switch (GelerWeterControl.choose)
+ switch (SingleSelect())
{
case 1:
DB2105WriteHelper.WriteManScrewH1();
@@ -487,9 +562,101 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
}
+ #region 帮助类
+
+ ///
+ /// 单选选择
+ ///
+ /// 返回单选的产线号 如果未选择返回0
+ private int SingleSelect()
+ {
+ if (Convert.ToBoolean(ControlsEntity.Line1.MCValue) == true)
+ {
+ return 1;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line2.MCValue) == true)
+ {
+ return 2;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line3.MCValue) == true)
+ {
+ return 3;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line4.MCValue) == true)
+ {
+ return 4;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line5.MCValue) == true)
+ {
+ return 5;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line6.MCValue) == true)
+ {
+ return 6;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line7.MCValue) == true)
+ {
+ return 7;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line8.MCValue) == true)
+ {
+ return 8;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ ///
+ /// 控件导入
+ ///
+ private void ControlImport()
+ {
+ ControlsEntity.Line1 = GetBaseControl("Line1");
+ ControlsEntity.Line2 = GetBaseControl("Line2");
+ ControlsEntity.Line3 = GetBaseControl("Line3");
+ ControlsEntity.Line4 = GetBaseControl("Line4");
+ ControlsEntity.Line5 = GetBaseControl("Line5");
+ ControlsEntity.Line6 = GetBaseControl("Line6");
+ ControlsEntity.Line7 = GetBaseControl("Line7");
+ ControlsEntity.Line8 = GetBaseControl("Line8");
+
+ ControlsEntity.ChooseMaterial1 = GetComboBoxControl("ChooseMaterial1");
+ ControlsEntity.ChooseMaterial2 = GetComboBoxControl("ChooseMaterial2");
+
+ ControlsEntity.MaterialWeight1 = GetBaseControl("MaterialWeight1");
+ ControlsEntity.MaterialWeight2 = GetBaseControl("MaterialWeight2");
+ ControlsEntity.MaterialTolerance1 = GetBaseControl("MaterialTolerance1");
+ ControlsEntity.MaterialTolerance2 = GetBaseControl("MaterialTolerance2");
+ ControlsEntity.GelSpeedSet = GetBaseControl("GelSpeedSet");
+ ControlsEntity.GelPosTimeA = GetBaseControl("GelPosTimeA");
+ ControlsEntity.GelNagTimeB = GetBaseControl("GelNagTimeB");
+ ControlsEntity.GelPosTimeC = GetBaseControl("GelPosTimeC");
+ ControlsEntity.GelWaterTime = GetBaseControl("GelWaterTime");
+ ControlsEntity.GelWaitTime = GetBaseControl("GelWaitTime");
+ ControlsEntity.GelCloseHeatTime = GetBaseControl("GelCloseHeatTime");
+ ControlsEntity.GelOutDelayTime = GetBaseControl("GelOutDelayTime");
+
+ ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight");
+ ControlsEntity.WetMixTime = GetBaseControl("WetMixTime");
+ ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime");
+ ControlsEntity.ManualTolerance = GetBaseControl("ManualTolerance");
+ ControlsEntity.ManualWeight = GetBaseControl("ManualWeight");
+
+ ControlsEntity.WetManualControl = GetButtonControl("WetManualControl");
+ ControlsEntity.Download = GetButtonControl("Download");
+ ControlsEntity.LineStart = GetButtonControl("LineStart");
+ ControlsEntity.LineStop = GetButtonControl("LineStop");
+ ControlsEntity.GelManualPowder = GetButtonControl("GelManualPowder");
+ ControlsEntity.GelManualColdWater = GetButtonControl("GelManualColdWater");
+ ControlsEntity.GelManualHotWater = GetButtonControl("GelManualHotWater");
+ ControlsEntity.WetManualGel = GetButtonControl("WetManualGel");
+ }
+
private IBaseControl GetBaseControl(string name)
{
-
+
return McControls.First(x => x.Name == name) as IBaseControl;
}
@@ -502,6 +669,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
{
return McControls.First(x => x.Name == name) as MCCombobox;
}
+
+ #endregion
+
}
}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
index 5102bbb..f49e784 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
@@ -1,6 +1,8 @@
-using Mesnac.Action.Base;
+using DevExpress.DataAccess.Wizard.Presenters;
+using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.AutoControl.DB;
using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
+using Mesnac.Action.ChemicalWeighing.FreeDb;
using Mesnac.Action.ChemicalWeighing.LjPlanning;
using Mesnac.Controls.Base;
using Mesnac.Controls.Default;
@@ -29,8 +31,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
ControlImport();
+ ControlsEntity.Line1.MCValue = true;
+
ControlInitFromPLC();
-
+
}
///
@@ -38,13 +42,38 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
///
private void ControlInitFromPLC()
{
- //switch (SingleSelect())
- //{
- // case 1:
- // LjPlanningPlcHelp.GetGelatG1.
- //}
+
ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
+
+ var selected = FreeSqlUnit.Instance.Select().Where(x => x.DeviceId == SingleSelect()).ToList();
+
+ if(selected.Count != 0)
+ {
+ ControlsEntity.ChooseMaterial1.SelectedValue = selected[0].MaterrialId;
+ ControlsEntity.ChooseMaterial2.SelectedValue = selected[1].MaterrialId;
+ }
+ else
+ {
+ ControlsEntity.ChooseMaterial1.SelectedIndex = -1;
+ ControlsEntity.ChooseMaterial2.SelectedIndex = -1;
+ }
+
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM1[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM1[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM1[4].MixTime;
}
///
@@ -97,13 +126,6 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
private void ControlImport()
{
ControlsEntity.Line1 = GetBaseControl("Line1");
- ControlsEntity.Line2 = GetBaseControl("Line2");
- ControlsEntity.Line3 = GetBaseControl("Line3");
- ControlsEntity.Line4 = GetBaseControl("Line4");
- ControlsEntity.Line5 = GetBaseControl("Line5");
- ControlsEntity.Line6 = GetBaseControl("Line6");
- ControlsEntity.Line7 = GetBaseControl("Line7");
- ControlsEntity.Line8 = GetBaseControl("Line8");
ControlsEntity.ChooseMaterial1 = GetComboBoxControl("ChooseMaterial1");
ControlsEntity.ChooseMaterial2 = GetComboBoxControl("ChooseMaterial2");
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/RefreshAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/RefreshAction.cs
new file mode 100644
index 0000000..67d1320
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/RefreshAction.cs
@@ -0,0 +1,296 @@
+using Mesnac.Action.Base;
+using Mesnac.Action.ChemicalWeighing.AutoControl.DB;
+using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
+using Mesnac.Action.ChemicalWeighing.FreeDb;
+using Mesnac.Action.ChemicalWeighing.LjPlanning;
+using Mesnac.Controls.Base;
+using Mesnac.Controls.Default;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.AutoControl
+{
+ public class RefreshAction : ChemicalWeighingAction, IAction
+ {
+ GelerWeterControlsEntity ControlsEntity = new GelerWeterControlsEntity();
+ private List McControls;
+
+ public void Run(RuntimeParameter runtime)
+ {
+
+ base.RunIni(runtime); //必须要调用
+
+ McControls = GetAllControls();
+
+ ControlImport();
+
+ ControlInitFromPLC();
+
+ }
+
+ ///
+ /// 控件从Plc初始化
+ ///
+ private void ControlInitFromPLC()
+ {
+ //switch (SingleSelect())
+ //{
+ // case 1:
+ // LjPlanningPlcHelp.GetGelatG1.
+ //}
+ ControlsEntity.ChooseMaterial1.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
+ ControlsEntity.ChooseMaterial2.DataSource = StockMaterrialDbHelp.GetSiloMaterrial();
+
+ var selected = FreeSqlUnit.Instance.Select().Where(x => x.DeviceId == SingleSelect()).ToList();
+
+ if (selected.Count != 0)
+ {
+ ControlsEntity.ChooseMaterial1.SelectedValue = selected[0].MaterrialId;
+ ControlsEntity.ChooseMaterial2.SelectedValue = selected[1].MaterrialId;
+ }
+ else
+ {
+ ControlsEntity.ChooseMaterial1.SelectedIndex = -1;
+ ControlsEntity.ChooseMaterial2.SelectedIndex = -1;
+ }
+
+ switch (SingleSelect())
+ {
+ case 1:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM1[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM1[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM1[4].MixTime;
+ break;
+ case 2:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG2.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM2[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM2[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM2[4].MixTime;
+ break;
+ case 3:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG3.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM3[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM3[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM3[4].MixTime;
+ break;
+ case 4:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG4.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM4[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM4[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM4[4].MixTime;
+ break;
+ case 5:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG5.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM5[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM5[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM5[4].MixTime;
+ break;
+ case 6:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG6.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM6[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM6[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM6[4].MixTime;
+ break;
+ case 7:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG7.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM7[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM7[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM7[4].MixTime;
+ break;
+ case 8:
+ ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipePlcViews[0].Set;
+ ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipePlcViews[1].Set;
+ ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipePlcViews[0].Tolerance;
+ ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipePlcViews[1].Tolerance;
+ ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[0].MixSpeed;
+ ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[2].MixTemp;
+ ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[2].MixSpeed;
+ ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[2].MixTime;
+ ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[4].MixTime;
+ ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[6].MixTime;
+ ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[7].MixTime;
+ ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG8.RecipeSteps[7].MixTemp;
+ ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM8[1].SetValue;
+ ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM8[2].MixTime;
+ ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM8[4].MixTime;
+ break;
+ default:
+ return;
+
+ }
+
+ }
+
+ ///
+ /// 单选选择
+ ///
+ /// 返回单选的产线号 如果未选择返回0
+ private int SingleSelect()
+ {
+ if (Convert.ToBoolean(ControlsEntity.Line1.MCValue) == true)
+ {
+ return 1;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line2.MCValue) == true)
+ {
+ return 2;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line3.MCValue) == true)
+ {
+ return 3;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line4.MCValue) == true)
+ {
+ return 4;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line5.MCValue) == true)
+ {
+ return 5;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line6.MCValue) == true)
+ {
+ return 6;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line7.MCValue) == true)
+ {
+ return 7;
+ }
+ else if (Convert.ToBoolean(ControlsEntity.Line8.MCValue) == true)
+ {
+ return 8;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ ///
+ /// 控件导入
+ ///
+ private void ControlImport()
+ {
+ ControlsEntity.Line1 = GetBaseControl("Line1");
+ ControlsEntity.Line2 = GetBaseControl("Line2");
+ ControlsEntity.Line3 = GetBaseControl("Line3");
+ ControlsEntity.Line4 = GetBaseControl("Line4");
+ ControlsEntity.Line5 = GetBaseControl("Line5");
+ ControlsEntity.Line6 = GetBaseControl("Line6");
+ ControlsEntity.Line7 = GetBaseControl("Line7");
+ ControlsEntity.Line8 = GetBaseControl("Line8");
+
+ ControlsEntity.ChooseMaterial1 = GetComboBoxControl("ChooseMaterial1");
+ ControlsEntity.ChooseMaterial2 = GetComboBoxControl("ChooseMaterial2");
+
+ ControlsEntity.MaterialWeight1 = GetBaseControl("MaterialWeight1");
+ ControlsEntity.MaterialWeight2 = GetBaseControl("MaterialWeight2");
+ ControlsEntity.MaterialTolerance1 = GetBaseControl("MaterialTolerance1");
+ ControlsEntity.MaterialTolerance2 = GetBaseControl("MaterialTolerance2");
+ ControlsEntity.GelSpeedSet = GetBaseControl("GelSpeedSet");
+ ControlsEntity.GelPosTimeA = GetBaseControl("GelPosTimeA");
+ ControlsEntity.GelNagTimeB = GetBaseControl("GelNagTimeB");
+ ControlsEntity.GelPosTimeC = GetBaseControl("GelPosTimeC");
+ ControlsEntity.GelWaterTime = GetBaseControl("GelWaterTime");
+ ControlsEntity.GelWaitTime = GetBaseControl("GelWaitTime");
+ ControlsEntity.GelCloseHeatTime = GetBaseControl("GelCloseHeatTime");
+ ControlsEntity.GelOutDelayTime = GetBaseControl("GelOutDelayTime");
+
+ ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight");
+ ControlsEntity.WetMixTime = GetBaseControl("WetMixTime");
+ ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime");
+
+ }
+
+ private IBaseControl GetBaseControl(string name)
+ {
+ return McControls.First(x => x.Name == name) as IBaseControl;
+ }
+
+ private MCCombobox GetComboBoxControl(string name)
+ {
+ return McControls.First(x => x.Name == name) as MCCombobox;
+ }
+ }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
index f67bb78..41125f9 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
@@ -8,7 +8,30 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
{
public class LjPlanningPlcHelp
{
-
+
+ public static DryerView GetDryerD1 => GetDryerView(58);
+ public static DryerView GetDryerD2 => GetDryerView(298);
+ public static DryerView GetDryerD3 => GetDryerView(538);
+ public static DryerView GetDryerD4 => GetDryerView(778);
+
+ public static DryerView GetGelatG1 => GetGelatView(1018);
+ public static DryerView GetGelatG2 => GetGelatView(1158);
+ public static DryerView GetGelatG3 => GetGelatView(1298);
+ public static DryerView GetGelatG4 => GetGelatView(1438);
+ public static DryerView GetGelatG5 => GetGelatView(1578);
+ public static DryerView GetGelatG6 => GetGelatView(1718);
+ public static DryerView GetGelatG7 => GetGelatView(1858);
+ public static DryerView GetGelatG8 => GetGelatView(1998);
+
+ public static List GetWeterM1 = GetWeterView(2138);
+ public static List GetWeterM2 = GetWeterView(2338);
+ public static List GetWeterM3 = GetWeterView(2538);
+ public static List GetWeterM4 = GetWeterView(2738);
+ public static List GetWeterM5 = GetWeterView(2938);
+ public static List GetWeterM6 = GetWeterView(3138);
+ public static List GetWeterM7 = GetWeterView(3338);
+ public static List GetWeterM8 = GetWeterView(3538);
+
///
/// 干混机1
///
@@ -447,32 +470,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
}
-
- public static DryerView GetDryerD1 => GetDryerView(58);
- public static DryerView GetDryerD2 => GetDryerView(298);
- public static DryerView GetDryerD3 => GetDryerView(538);
- public static DryerView GetDryerD4 => GetDryerView(778);
-
- public static DryerView GetGelatG1 => GetGelatView(1018);
- public static DryerView GetGelatG2 => GetGelatView(1158);
- public static DryerView GetGelatG3 => GetGelatView(1298);
- public static DryerView GetGelatG4 => GetGelatView(1438);
- public static DryerView GetGelatG5 => GetGelatView(1578);
- public static DryerView GetGelatG6 => GetGelatView(1718);
- public static DryerView GetGelatG7 => GetGelatView(1858);
- public static DryerView GetGelatG8 => GetGelatView(1998);
-
- public static List GetWeterM1 = GetWeterView(2138);
- public static List GetWeterM2 = GetWeterView(2338);
- public static List GetWeterM3 = GetWeterView(2538);
- public static List GetWeterM4 = GetWeterView(2738);
- public static List GetWeterM5 = GetWeterView(2938);
- public static List GetWeterM6 = GetWeterView(3138);
- public static List GetWeterM7 = GetWeterView(3338);
- public static List GetWeterM8 = GetWeterView(3538);
-
-
-
private static DryerView GetDryerView(int start)
{
var byteTransform = PlcConnect.Instance.ByteTransform;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 5b8b513..d827e38 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -227,6 +227,7 @@
+
diff --git a/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs b/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
index ee20343..e84b04b 100644
--- a/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
+++ b/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
@@ -319,7 +319,7 @@ namespace DataBlockHelper.DBHelpers
///
- /// 点击下粉料按钮 湿混机 如果返回true 就是成功 如果返回失败 就是准备信号么有准备好
+ /// 点击下糊化料按钮 湿混机 如果返回true 就是成功 如果返回失败 就是准备信号么有准备好
///
///
diff --git a/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml b/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml
index 30325b9..95ce032 100644
--- a/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml
+++ b/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml
@@ -14,6 +14,10 @@
界面初始化
界面初始化
+
+ 刷新事件
+ 刷新事件
+
@@ -28,6 +32,9 @@
+
+
+
@@ -35,6 +42,7 @@
+
\ No newline at end of file
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
index 5e8840a..0a2f04f 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
@@ -78,7 +78,7 @@