diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index 1b6f6ed..f19bb43 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -1716,7 +1716,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
{
switch (code)
{
- case 1: return "加糊化料";
+ case 1: return "加冷水";
case 2: return "加粉料";
case 3: return "搅拌";
case 4: return "加热水";
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
index b642f98..87f8938 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs
@@ -223,6 +223,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report
});
}
+ else
+ {
+ break;
+ }
}
foreach (var item in dryer.Mix)
@@ -318,6 +322,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report
kinds = 1
});
}
+ else
+ {
+ break;
+ }
}
@@ -461,6 +469,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report
});
}
+ else
+ {
+ break;
+ }
}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
index dc9b337..bd854db 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
@@ -42,7 +42,7 @@ namespace Mesnac.Action.ChemicalWeighing.Test
public void theout(object source, EventArgs e)
{
- ReportReadDb.Read();
+
}
@@ -52,6 +52,8 @@ namespace Mesnac.Action.ChemicalWeighing.Test
var allDb=GetAllControls();
mCButton = allDb.FirstOrDefault(x => x.Name == "MCButton1") as MCButton;
+ mCButton.Click += MCButton_Click;
+
System.Timers.Timer t = new System.Timers.Timer(5000);//实例化Timer类，设置间隔时间为10000毫秒；
t.Elapsed += new System.Timers.ElapsedEventHandler(theout);//到达时间的时候执行事件；
t.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
@@ -59,6 +61,9 @@ namespace Mesnac.Action.ChemicalWeighing.Test
}
-
+ private void MCButton_Click(object sender, EventArgs e)
+ {
+ ReportReadDb.Read();
+ }
}
}
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml
index 5226ac0..5b3c0d1 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeliver.xml
@@ -4313,13 +4313,6 @@
LjSwith347
14, 12
-