From db3fc8b4f49b4e88834b9abd55a3d89b496f652f Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Sat, 2 Dec 2023 10:06:46 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=95=B0=E5=AD=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9B=BF=E6=8D=A2=20=E6=B7=BB=E5=8A=A0=E6=90=85?=
 =?UTF-8?q?=E6=8B=8C=E6=80=BB=E9=94=85=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DayWhiteEmbryo/GelBlackPowderCount.cs     |   7 +-
 .../Entity/DeviceDetailEntity.cs              |  17 -
 .../MainDetailControlAction.cs                |  64 +--
 .../Data/MCProject/nodeForm/MainDetail.xml    | 380 +-----------------
 4 files changed, 32 insertions(+), 436 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs
index 2c9b227..d2cf9b9 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs
@@ -47,6 +47,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
         List<ManualLogEntity> listMore;
 
         List<ManualLogEntity> listSet;
+
         public void Run(RuntimeParameter runtime)
         {
             base.RunIni(runtime); //必须调用
@@ -203,16 +204,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
                 dr[0] = "湿混机" + i;
                 var totalWeight = list.Where(x => x.deviceno == i).Sum(x => x.value);
                 dr[1] = totalWeight.ToString();
-
-                var totalCount=list.Where(x => x.deviceno==i).Where(x=>x.value>400).Count();
+                var totalCount = list.Where(x => x.deviceno == i).Where(x => x.value > 400).Count();
                 dr[2] = totalCount.ToString();
-
-
                 dt.Rows.Add(dr);
             }
             var edr = dt.NewRow();
             edr[0] = "生产总和";
             edr[1] = list.Sum(x => x.value).ToString();
+            edr[2] = list.Where(x => x.value > 400).Count();
             dt.Rows.Add(edr);
 
             dataGridView.DataSource = null;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs
index d0a9b9a..d613ac8 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs
@@ -63,23 +63,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public MCLabel ValueWeight3 { get; set; }
         public MCLabel ValueWeight4 { get; set; }
 
-        public MCLabel WetWait1 { get; set; }
-        public MCLabel WetWait2 { get; set; }
-        public MCLabel WetWait3 { get; set; }
-        public MCLabel WetWait4 { get; set; }
-        public MCLabel WetWait5 { get; set; }
-        public MCLabel WetWait6 { get; set; }
-        public MCLabel WetWait7 { get; set; }
-        public MCLabel WetWait8 { get; set; }
-        public MCLabel RGVWait1 { get; set; }
-        public MCLabel RGVWait2 { get; set; }
-        public MCLabel RGVWait3 { get; set; }
-        public MCLabel RGVWait4 { get; set; }
-        public MCLabel RGVWait5 { get; set; }
-        public MCLabel RGVWait6 { get; set; }
-        public MCLabel RGVWait7 { get; set; }
-        public MCLabel RGVWait8 { get; set; }
-
     }
 
     public class SwitchLightEntity
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index cb23142..791911b 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -181,8 +181,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 PropertyInfo property = ledDisplayType.GetProperty(name);
                 HslLedDisplay ledDisplay = (HslLedDisplay)property.GetValue(LedDisplayE);
                 //bottle.Value = n * i++;
-                ledDisplay.BackColor = Color.FromArgb(46, 46, 46);
-                ledDisplay.DisplayBackColor = Color.FromArgb(62, 62, 62);
+                ledDisplay.BackColor = Color.FromArgb(32, 72, 98);
+                ledDisplay.DisplayBackColor = Color.FromArgb(32, 72, 98);
                 ledDisplay.DisplayNumber = 5;
                 ledDisplay.ForeColor = Color.White;
                 ledDisplay.LedNumberSize = 2;
@@ -362,6 +362,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                 if (!Mixes[i] && !record.RGVIsReach && record.MixIsReady)
                 {
                     MessageBox.Show("湿混机搅拌完毕指示灯无故熄灭\nRGV小车未到达 接料未结束");
+                    FreeSqlUnit.Instance.Update<Lj_RGVTimeRecord>()
+                        .Set(x => x.MixIsReady, false)
+                        .Where(x => x.DeviceNo == deviceNo && !x.Done).ExecuteAffrows();
                 }
             }
         }
@@ -380,49 +383,31 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                         switch (deviceNo)
                         {
                             case 1:
-                                LabelE.WetWait1.Text = MixWaitTime(record);
-                                LabelE.WetWait1.ForeColor = MixTimeBackColor(record);
-                                LabelE.RGVWait1.Text = "0";
                                 LedDisplayE.WetWaitDisPlay1.DisplayText = MixWaitTimeLed(record);
                                 LedDisplayE.WetWaitDisPlay1.ForeColor = MixTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay1.DisplayText = "00:00";
                                 break;
                             case 2:
-                                LabelE.WetWait2.Text = MixWaitTime(record);
-                                LabelE.WetWait2.ForeColor = MixTimeBackColor(record);
-                                LabelE.RGVWait2.Text = "0";
                                 LedDisplayE.WetWaitDisPlay2.DisplayText = MixWaitTimeLed(record);
                                 LedDisplayE.WetWaitDisPlay2.ForeColor = MixTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay2.DisplayText = "00:00";
                                 break;
                             case 3:
-                                LabelE.WetWait3.Text = MixWaitTime(record);
-                                LabelE.WetWait3.ForeColor = MixTimeBackColor(record);
-                                LabelE.RGVWait3.Text = "0";
                                 LedDisplayE.WetWaitDisPlay3.DisplayText = MixWaitTimeLed(record);
                                 LedDisplayE.WetWaitDisPlay3.ForeColor = MixTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay3.DisplayText = "00:00";
                                 break;
                             case 4:
-                                LabelE.WetWait4.Text = MixWaitTime(record);
-                                LabelE.WetWait4.ForeColor = MixTimeBackColor(record);
-                                LabelE.RGVWait4.Text = "0";
                                 LedDisplayE.WetWaitDisPlay4.DisplayText = MixWaitTimeLed(record);
                                 LedDisplayE.WetWaitDisPlay4.ForeColor = MixTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay4.DisplayText = "00:00";
                                 break;
                             case 5:
-                                LabelE.WetWait5.Text = MixWaitTime(record);
-                                LabelE.WetWait5.ForeColor = MixTimeBackColor(record);
-                                LabelE.RGVWait5.Text = "0";
                                 LedDisplayE.WetWaitDisPlay5.DisplayText = MixWaitTimeLed(record);
                                 LedDisplayE.WetWaitDisPlay5.ForeColor = MixTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay5.DisplayText = "00:00";
                                 break;
                             case 6:
-                                LabelE.WetWait6.Text = MixWaitTime(record);
-                                LabelE.WetWait6.ForeColor = MixTimeBackColor(record);
-                                LabelE.RGVWait6.Text = "0";
                                 LedDisplayE.WetWaitDisPlay6.DisplayText = MixWaitTimeLed(record);
                                 LedDisplayE.WetWaitDisPlay6.ForeColor = MixTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay6.DisplayText = "00:00";
@@ -436,38 +421,26 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                         switch (deviceNo)
                         {
                             case 1:
-                                LabelE.RGVWait1.Text = RGVWaitTime(record);
-                                LabelE.WetWait1.ForeColor = RGVTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay1.DisplayText = RGVWaitTimeLed(record);
                                 LedDisplayE.RGVWaitDisPlay1.ForeColor = RGVTimeBackColor(record);
                                 break;
                             case 2:
-                                LabelE.RGVWait2.Text = RGVWaitTime(record);
-                                LabelE.WetWait2.ForeColor = RGVTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay2.DisplayText = RGVWaitTimeLed(record);
                                 LedDisplayE.RGVWaitDisPlay2.ForeColor = RGVTimeBackColor(record);
                                 break;
                             case 3:
-                                LabelE.RGVWait3.Text = RGVWaitTime(record);
-                                LabelE.WetWait3.ForeColor = RGVTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay3.DisplayText = RGVWaitTimeLed(record);
                                 LedDisplayE.RGVWaitDisPlay3.ForeColor = RGVTimeBackColor(record);
                                 break;
                             case 4:
-                                LabelE.RGVWait4.Text = RGVWaitTime(record);
-                                LabelE.WetWait4.ForeColor = RGVTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay4.DisplayText = RGVWaitTimeLed(record);
                                 LedDisplayE.RGVWaitDisPlay4.ForeColor = RGVTimeBackColor(record);
                                 break;
                             case 5:
-                                LabelE.RGVWait5.Text = RGVWaitTime(record);
-                                LabelE.WetWait5.ForeColor = RGVTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay5.DisplayText = RGVWaitTimeLed(record);
                                 LedDisplayE.RGVWaitDisPlay5.ForeColor = RGVTimeBackColor(record);
                                 break;
                             case 6:
-                                LabelE.RGVWait6.Text = RGVWaitTime(record);
-                                LabelE.WetWait6.ForeColor = RGVTimeBackColor(record);
                                 LedDisplayE.RGVWaitDisPlay6.DisplayText = RGVWaitTimeLed(record);
                                 LedDisplayE.RGVWaitDisPlay6.ForeColor = RGVTimeBackColor(record);
                                 break;
@@ -479,17 +452,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             }
         }
 
-        private string RGVWaitTime(Lj_RGVTimeRecord record)
-        {
-            int t = Convert.ToInt32((DateTime.Now - record.RGVReachTime).TotalSeconds);
-            return SecondToMinute(t);
-        }
-
-        private string MixWaitTime(Lj_RGVTimeRecord record)
-        {
-            int t = Convert.ToInt32((DateTime.Now - record.MixReadyStartTime).TotalSeconds);
-            return SecondToMinute(t);
-        }
         private string RGVWaitTimeLed(Lj_RGVTimeRecord record)
         {
             int t = Convert.ToInt32((DateTime.Now - record.RGVReachTime).TotalSeconds);
@@ -502,7 +464,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             return SecondToTime(t);
         }
 
-
         private Color RGVTimeBackColor(Lj_RGVTimeRecord record)
         {
             int t = Convert.ToInt32((DateTime.Now - record.RGVReachTime).TotalSeconds);
@@ -532,26 +493,15 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             }
         }
 
-        private string SecondToMinute(int t)
-        {
-            int m = t / 60;
-            int s = t % 60;
-            if (m == 0)
-            {
-                return s + "秒";
-            }
-            return m + " 分 " + s + " 秒 ";
-        }
-
         private string SecondToTime(int t)
         {
             int m = t / 60;
             int s = t % 60;
             if (m == 0)
             {
-                return "00:" + t;
+                return "00:" + s.ToString("00");
             }
-            return m + ":" + s;
+            return m.ToString("00") + ":" + s.ToString("00");
         }
 
         #endregion
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
index 9e8cbf3..27cabed 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
@@ -2,421 +2,85 @@
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MainDetail" children="Controls">
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay8" children="Controls">
-        <Property name="Location">1773, 669</Property>
+        <Property name="Location">1774, 592</Property>
         <Property name="Name">RGVWaitDisPlay8</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay7" children="Controls">
-        <Property name="Location">1692, 669</Property>
+        <Property name="Location">1693, 592</Property>
         <Property name="Name">RGVWaitDisPlay7</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay8" children="Controls">
-        <Property name="Location">1773, 631</Property>
+        <Property name="Location">1774, 554</Property>
         <Property name="Name">WetWaitDisPlay8</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay7" children="Controls">
-        <Property name="Location">1692, 631</Property>
+        <Property name="Location">1693, 554</Property>
         <Property name="Name">WetWaitDisPlay7</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay6" children="Controls">
-        <Property name="Location">1459, 669</Property>
+        <Property name="Location">1460, 592</Property>
         <Property name="Name">RGVWaitDisPlay6</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay5" children="Controls">
-        <Property name="Location">1378, 669</Property>
+        <Property name="Location">1379, 592</Property>
         <Property name="Name">RGVWaitDisPlay5</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay6" children="Controls">
-        <Property name="Location">1459, 631</Property>
+        <Property name="Location">1460, 554</Property>
         <Property name="Name">WetWaitDisPlay6</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay5" children="Controls">
-        <Property name="Location">1378, 631</Property>
+        <Property name="Location">1379, 554</Property>
         <Property name="Name">WetWaitDisPlay5</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay4" children="Controls">
-        <Property name="Location">1218, 669</Property>
+        <Property name="Location">1219, 592</Property>
         <Property name="Name">RGVWaitDisPlay4</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay3" children="Controls">
-        <Property name="Location">1137, 669</Property>
+        <Property name="Location">1138, 592</Property>
         <Property name="Name">RGVWaitDisPlay3</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay4" children="Controls">
-        <Property name="Location">1218, 631</Property>
+        <Property name="Location">1219, 554</Property>
         <Property name="Name">WetWaitDisPlay4</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay3" children="Controls">
-        <Property name="Location">1137, 631</Property>
+        <Property name="Location">1138, 554</Property>
         <Property name="Name">WetWaitDisPlay3</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay2" children="Controls">
-        <Property name="Location">912, 669</Property>
+        <Property name="Location">913, 592</Property>
         <Property name="Name">RGVWaitDisPlay2</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWaitDisPlay1" children="Controls">
-        <Property name="Location">831, 669</Property>
+        <Property name="Location">832, 592</Property>
         <Property name="Name">RGVWaitDisPlay1</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay2" children="Controls">
-        <Property name="Location">912, 631</Property>
+        <Property name="Location">913, 554</Property>
         <Property name="Name">WetWaitDisPlay2</Property>
         <Property name="Size">75, 32</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.HslLedDisplay, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWaitDisPlay1" children="Controls">
-        <Property name="Location">831, 631</Property>
+        <Property name="Location">832, 554</Property>
         <Property name="Name">WetWaitDisPlay1</Property>
         <Property name="Size">75, 32</Property>
       </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait8" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1778, 599</Property>
-        <Property name="Name">RGVWait8</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait8" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1778, 563</Property>
-        <Property name="Name">WetWait8</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait7" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1698, 599</Property>
-        <Property name="Name">RGVWait7</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait7" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1698, 563</Property>
-        <Property name="Name">WetWait7</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait6" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1466, 600</Property>
-        <Property name="Name">RGVWait6</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait6" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1466, 564</Property>
-        <Property name="Name">WetWait6</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait5" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1386, 600</Property>
-        <Property name="Name">RGVWait5</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait5" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1386, 564</Property>
-        <Property name="Name">WetWait5</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait4" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1226, 598</Property>
-        <Property name="Name">RGVWait4</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait4" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1226, 562</Property>
-        <Property name="Name">WetWait4</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait3" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1146, 598</Property>
-        <Property name="Name">RGVWait3</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait3" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1146, 562</Property>
-        <Property name="Name">WetWait3</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait2" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">914, 599</Property>
-        <Property name="Name">RGVWait2</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait2" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">914, 563</Property>
-        <Property name="Name">WetWait2</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="RGVWait1" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">834, 599</Property>
-        <Property name="Name">RGVWait1</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WetWait1" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="NewFillColor">Red</Property>
-        <Property name="OldFillColor">DarkGray</Property>
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="Text">0</Property>
-        <Property name="Font">宋体, 10pt</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">834, 563</Property>
-        <Property name="Name">WetWait1</Property>
-        <Property name="Size">14, 14</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel133" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -431,11 +95,11 @@
         <Property name="DbOptionType">None</Property>
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
-        <Property name="Text">RGV/t</Property>
+        <Property name="Text">响应</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">777, 601</Property>
+        <Property name="Location">797, 601</Property>
         <Property name="Name">MCLabel133</Property>
-        <Property name="Size">35, 12</Property>
+        <Property name="Size">29, 12</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel132" children="Controls">
         <Property name="Format" />
@@ -451,11 +115,11 @@
         <Property name="DbOptionType">None</Property>
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
-        <Property name="Text">混炼完/t</Property>
+        <Property name="Text">呼叫</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">777, 565</Property>
+        <Property name="Location">797, 564</Property>
         <Property name="Name">MCLabel132</Property>
-        <Property name="Size">53, 12</Property>
+        <Property name="Size">29, 12</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel135" children="Controls">
         <Property name="Format" />