加冷水

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 "加热水";

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;
+                }
 
             }
 

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();
+        }
     }
 }

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

@@ -4313,13 +4313,6 @@
                       <Property name="Name">LjSwith347</Property>
                       <Property name="Size">14, 12</Property>
                     </Object>
-                    <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith348" children="Controls">
-                      <Property name="AlarmName">ParametersWithPc.FC5_Motor.DM1GDP01_Alarm</Property>
-                      <Property name="SetName">ParametersWithPc.FC5_Motor.DM1GDP01_Running</Property>
-                      <Property name="Location">217, 167</Property>
-                      <Property name="Name">LjSwith348</Property>
-                      <Property name="Size">14, 12</Property>
-                    </Object>
                     <Object type="Mesnac.Controls.ChemicalWeighing.Dou, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Dou27" children="Controls">
                       <Property name="Location">1663, 43</Property>
                       <Property name="Name">Dou27</Property>