diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs index 1719838..2dbd049 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs @@ -3158,5 +3158,6 @@ namespace Mesnac.Action.ChemicalWeighing + public DataKeyValue recipeName { get; set; } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerPlc.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerPlc.cs index 0434bac..c98d5cd 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerPlc.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerPlc.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading.Tasks; -using Microsoft.Office.Interop.Excel; + namespace Mesnac.Action.ChemicalWeighing.LjMixManager { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 92c9fc2..1e40e9d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -153,6 +153,9 @@ False ..\..\..\PlugInPlatform\Mesnac.PlugIn.dll + + ..\Microsoft.Office.Interop.Excel.dll + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs index 7904fd2..82b5add 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs @@ -37,6 +37,9 @@ namespace Mesnac.Action.ChemicalWeighing.Test // dbHelper.CommandType = CommandType.Text; // dbHelper.CommandText = sql; + + + var str = BasePlcHelper.Instance.recipeName.LastValue.ToString(); FrmMixA frmMetageFormula = new FrmMixA(1); frmMetageFormula.Show(); diff --git a/Actions/ChemicalWeighing/Microsoft.Office.Interop.Excel.dll b/Actions/ChemicalWeighing/Microsoft.Office.Interop.Excel.dll new file mode 100644 index 0000000..2ef9126 Binary files /dev/null and b/Actions/ChemicalWeighing/Microsoft.Office.Interop.Excel.dll differ diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index f2388e1..76a7a48 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -7697,12 +7697,13 @@ - + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml index ad40a1c..58db7de 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml @@ -622,7 +622,7 @@ - ParametersWithPc.B1.WatchDog + ParametersWithPc.Tst3.recipeName Red DarkGray diff --git a/SlnMix.VS2013.sln b/SlnMix.VS2013.sln index 0dd68d4..4d441b2 100644 --- a/SlnMix.VS2013.sln +++ b/SlnMix.VS2013.sln @@ -100,6 +100,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{8F6E ProjectSection(SolutionItems) = preProject Actions\Mesnac.Action.Base.dll = Actions\Mesnac.Action.Base.dll Actions\Mesnac.ActionService.dll = Actions\Mesnac.ActionService.dll + Actions\ChemicalWeighing\Microsoft.Office.Interop.Excel.dll = Actions\ChemicalWeighing\Microsoft.Office.Interop.Excel.dll EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Default", "Default", "{66F3B234-E56C-4EF4-AB6D-BB6D91467855}"