diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/Class1.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/Class1.cs
index 095bc8e..23b3155 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/Class1.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/Class1.cs
@@ -25,6 +25,9 @@ namespace Mesnac.Action.ChemicalWeighing.Dan
MCButton BtnA;
MCButton BtnB;
MCButton BtnC;
+ HslLanternSimple HslLanternSimple2147483646;
+ MCButton MCButton2147483646;
+
public void Run(RuntimeParameter runtime)
{
RunIni(runtime);
@@ -45,10 +48,14 @@ namespace Mesnac.Action.ChemicalWeighing.Dan
BtnB = controller.FirstOrDefault(x => x.Name == "BtnB") as MCButton;
BtnC = controller.FirstOrDefault(x => x.Name == "BtnC") as MCButton;
+ MCButton2147483646 = controller.FirstOrDefault(x => x.Name == "MCButton2147483646") as MCButton;
+
+ HslLanternSimple2147483646 = controller.FirstOrDefault(x => x.Name == "HslLanternSimple2147483646") as HslLanternSimple;
-// M20.4 A线确认
-//M20.5 B线确认
-//M20.6 C线确认
+
+ // M20.4 A线确认
+ //M20.5 B线确认
+ //M20.6 C线确认
BtnA.Click += (s, e) =>
{
@@ -92,6 +99,24 @@ namespace Mesnac.Action.ChemicalWeighing.Dan
}
};
+ MCButton2147483646.Click += (s, e) =>
+ {
+ //解包房除尘风机启动
+ var val = PlcConnect.Instance.ReadBool("DB191.DBX32.4").Content;
+ PlcConnect.Instance.Write("DB191.DBX32.4", !val);
+ //解包房除尘风机启动
+ val = PlcConnect.Instance.ReadBool("DB191.DBX32.4").Content;
+ SetValue(HslLanternSimple2147483646, val);
+ if (val)
+ {
+ MCButton2147483646.MCValue = "停止解包房除尘风机";
+ }
+ else
+ {
+ MCButton2147483646.MCValue = "启动解包房除尘风机";
+ }
+ };
+
timer = new Timer();
timer.Interval = 1000;
@@ -106,6 +131,16 @@ namespace Mesnac.Action.ChemicalWeighing.Dan
timer.Stop();
timer.Dispose();
}
+ //解包房除尘风机启动
+ var val = PlcConnect.Instance.ReadBool("DB191.DBX32.4").Content;
+ SetValue(HslLanternSimple2147483646, val);
+ if (val) {
+ MCButton2147483646.MCValue = "停止解包房除尘风机";
+ }
+ else
+ {
+ MCButton2147483646.MCValue = "启动解包房除尘风机";
+ }
Db92DengHelp dB92 = new Db92DengHelp();
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
index 556bf6d..a30a8a6 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
@@ -102,6 +102,24 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
HslLanternSimple HslLanternSimple2;
Color mcCol;
+ MCLabel WdA;
+ MCLabel WdB;
+ MCLabel WdC;
+ MCLabel WdD;
+ MCLabel WdE;
+ MCLabel WdF;
+ MCLabel WdG;
+ MCLabel WdH;
+ MCLabel WdI;
+ MCLabel WdJ;
+ MCLabel WdK;
+ MCLabel WdL;
+ MCLabel WdM;
+ MCLabel WdN;
+ MCLabel WdO;
+
+
+
#region 接口Run方法
public void Run(RuntimeParameter runtime)
@@ -123,6 +141,29 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
HslLanternSimple1 = Controls.FirstOrDefault(x => x != null && x.Name == "HslLanternSimple1") as HslLanternSimple;
HslLanternSimple2 = Controls.FirstOrDefault(x => x != null && x.Name == "HslLanternSimple2") as HslLanternSimple;
+ WdA= Controls.FirstOrDefault(x => x != null && x.Name == "WdA") as MCLabel;
+ WdB= Controls.FirstOrDefault(x => x != null && x.Name == "WdB") as MCLabel;
+ WdC = Controls.FirstOrDefault(x => x != null && x.Name == "WdC") as MCLabel;
+ WdD = Controls.FirstOrDefault(x => x != null && x.Name == "WdD") as MCLabel;
+
+ WdE = Controls.FirstOrDefault(x => x != null && x.Name == "WdE") as MCLabel;
+ WdF = Controls.FirstOrDefault(x => x != null && x.Name == "WdF") as MCLabel;
+
+ WdG = Controls.FirstOrDefault(x => x != null && x.Name == "WdG") as MCLabel;
+ WdH = Controls.FirstOrDefault(x => x != null && x.Name == "WdH") as MCLabel;
+
+ WdI = Controls.FirstOrDefault(x => x != null && x.Name == "WdI") as MCLabel;
+ WdJ = Controls.FirstOrDefault(x => x != null && x.Name == "WdJ") as MCLabel;
+
+ WdK = Controls.FirstOrDefault(x => x != null && x.Name == "WdK") as MCLabel;
+ WdL = Controls.FirstOrDefault(x => x != null && x.Name == "WdL") as MCLabel;
+
+ WdM = Controls.FirstOrDefault(x => x != null && x.Name == "WdM") as MCLabel;
+ WdN = Controls.FirstOrDefault(x => x != null && x.Name == "WdN") as MCLabel;
+ WdO = Controls.FirstOrDefault(x => x != null && x.Name == "WdO") as MCLabel;
+
+
+
mcCol = HslLanternSimple1.LanternBackground;
//wangsr();
@@ -146,6 +187,24 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
MCLabel350.Text = b.ToString("0.00") + " ℃";
Other(HslLanternSimple2, b);
+ var ls= DB1.GetWeiDu();
+ WdA.MCValue = ls[0]+" ℃";
+ WdB.MCValue = ls[1] + " ℃";
+ WdC.MCValue = ls[2] + " ℃";
+ WdD.MCValue = ls[3] + " ℃";
+ WdE.MCValue = ls[4] + " ℃";
+ WdF.MCValue = ls[5] + " ℃";
+ WdG.MCValue = ls[6] + " ℃";
+ WdH.MCValue = ls[7] + " ℃";
+ WdI.MCValue = ls[8] + " ℃";
+ WdJ.MCValue = ls[9] + " ℃";
+ WdK.MCValue = ls[10] + " ℃";
+ WdL.MCValue = ls[11] + " ℃";
+ WdM.MCValue = ls[12] + " ℃";
+ WdN.MCValue = ls[13] + " ℃";
+ WdO.MCValue = ls[14] + " ℃";
+
+
}
private void Other(HslLanternSimple simple,float a)
@@ -254,7 +313,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
timer.Dispose();
}
- other();
+
DB1 = new DB1Helper();
DB90 = new DB90Helper();
@@ -263,7 +322,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
DB191 = new DB191Helper();
DB120 = new DB120Helper();
DB141 = new DB141Helper();
-
+ other();
DB1GetData();
DB90GetData();
DB91GetData();
@@ -1377,6 +1436,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
{
warnTable.Status = 0;
}
+
+
ls.Add(warnTable);
}
diff --git a/DataBlockHelper/DBHelpers/DB141Helper.cs b/DataBlockHelper/DBHelpers/DB141Helper.cs
index 4bb585d..58cc820 100644
--- a/DataBlockHelper/DBHelpers/DB141Helper.cs
+++ b/DataBlockHelper/DBHelpers/DB141Helper.cs
@@ -11,7 +11,7 @@ namespace DataBlockHelper.DBHelpers
{
public DB141Helper()
{
- bytes = PlcConnect.Instance.Read("DB141.0.0", 7).Content;
+ bytes = PlcConnect.Instance.Read("DB141.0.0", 8).Content;
}
diff --git a/DataBlockHelper/DBHelpers/DB1Helper.cs b/DataBlockHelper/DBHelpers/DB1Helper.cs
index 38f9beb..7e8dd69 100644
--- a/DataBlockHelper/DBHelpers/DB1Helper.cs
+++ b/DataBlockHelper/DBHelpers/DB1Helper.cs
@@ -86,5 +86,42 @@ namespace DataBlockHelper.DBHelpers
public ForAnaLogOut SPV3DBT01 => new ForAnaLogOut(1280, bytes);
public ForAnaLogOut SPV3DBT02 => new ForAnaLogOut(1300, bytes);
+
+
+ ///
+ /// 温度
+ ///
+ ///
+
+ public List GetWeiDu()
+ {
+ var plc = PlcConnect.Instance;
+ List list = new List();
+ list.Add(plc.ReadFloat("DB1.1334").Content.ToString("0.00")); //a
+ list.Add(plc.ReadFloat("DB1.1354").Content.ToString("0.00")); //b
+ list.Add(plc.ReadFloat("DB1.1374").Content.ToString("0.00")); //c
+ list.Add(plc.ReadFloat("DB1.1394").Content.ToString("0.00")); //d
+ list.Add(plc.ReadFloat("DB1.1414").Content.ToString("0.00")); //e
+ list.Add(plc.ReadFloat("DB1.1434").Content.ToString("0.00")); //f
+ list.Add(plc.ReadFloat("DB1.1454").Content.ToString("0.00")); //G
+
+ list.Add(plc.ReadFloat("DB1.1474").Content.ToString("0.00")); //h
+ list.Add(plc.ReadFloat("DB1.1494").Content.ToString("0.00")); //I
+ list.Add(plc.ReadFloat("DB1.1514").Content.ToString("0.00")); //J
+ list.Add(plc.ReadFloat("DB1.1534").Content.ToString("0.00")); //k
+
+
+ list.Add(plc.ReadFloat("DB1.1554").Content.ToString("0.00")); //L
+ list.Add(plc.ReadFloat("DB1.1574").Content.ToString("0.00")); //M
+ list.Add(plc.ReadFloat("DB1.1594").Content.ToString("0.00")); //N
+ list.Add(plc.ReadFloat("DB1.1614").Content.ToString("0.00")); //0
+ list.Add(plc.ReadFloat("DB1.1634").Content.ToString("0.00"));
+ list.Add(plc.ReadFloat("DB1.1654").Content.ToString("0.00"));
+
+
+ return list;
+
+ }
+
}
}
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormQuRenAnNue.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormQuRenAnNue.xml
index 7ed5053..431526c 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormQuRenAnNue.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormQuRenAnNue.xml
@@ -1,5 +1,34 @@