From 34efa803e191319c35b0200f15dd4a6810a080a8 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Tue, 26 Sep 2023 13:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mesnac.Action.ChemicalWeighing.csproj     |   3 -
 Main/MCEdit/Data/MCProject/nodeDevice.xml     |   6 +-
 .../MCProject/nodeForm/FormLJRecipeData.xml   | 113 +++++++++++
 .../Data/MCProject/nodeForm/FormPlan.xml      | 182 +++++++++++++++++-
 4 files changed, 294 insertions(+), 10 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 8919388..cf646e0 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -168,9 +168,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Office.Interop.Excel">
-      <HintPath>..\..\Microsoft.Office.Interop.Excel.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml
index 1f76c8e..cb36b4e 100644
--- a/Main/MCEdit/Data/MCProject/nodeDevice.xml
+++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml
@@ -13,7 +13,7 @@
       </Connection>
     </Main>
     <Group>
-      <Group name="B1" block="2107" start="0" len="1032" access="ReadWrite" remark="ParametersWithPc" isautoread="False">
+      <Group name="B1" block="2107" start="0" len="1032" access="ReadWrite" remark="ParametersWithPc" isautoread="True">
         <Data>
           <Data name="FirstWord" runname="FirstWord" start="0" len="1" method="Default_Bit(0,1)" max="" issave="False" subtractor="" remark="FirstWord" />
           <Data name="WatchDog" runname="WatchDog" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="系统通用参数" />
@@ -3958,7 +3958,7 @@
           <Data name="WeterM8Step9_Tolerance" runname="WeterM8Step9_Tolerance" start="1787" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="设定公差" />
         </Data>
       </Group>
-      <Group name="DB2102-valveInitDB" block="2102" start="0" len="107" access="ReadWrite" remark="valveInitDB" isautoread="False">
+      <Group name="DB2102-valveInitDB" block="2102" start="0" len="107" access="ReadWrite" remark="valveInitDB" isautoread="True">
         <Data>
           <Data name="BU1ASF01_ManualMode" runname="BU1ASF01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU1ASF01_AutoMode" runname="BU1ASF01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -5395,7 +5395,7 @@
           <Data name="BU8GEB02_P" runname="BU8GEB02_P" start="106" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
         </Data>
       </Group>
-      <Group name="DB2103-motorInitDB" block="2103" start="0" len="209" access="ReadWrite" remark="motorInitDB" isautoread="False">
+      <Group name="DB2103-motorInitDB" block="2103" start="0" len="209" access="ReadWrite" remark="motorInitDB" isautoread="True">
         <Data>
           <Data name="DM1ASI01_ManualMode" runname="DM1ASI01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="DM1ASI01_AutoMode" runname="DM1ASI01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml
index d26c440..5094475 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml
@@ -520,6 +520,119 @@
             <Property name="Size">1094, 800</Property>
           </Object>
           <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel9" children="Controls">
+            <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel2" 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">配方类别</Property>
+              <Property name="Location">587, 21</Property>
+              <Property name="Name">MCLabel2</Property>
+              <Property name="Size">53, 12</Property>
+            </Object>
+            <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel1" 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">配方名称</Property>
+              <Property name="Location">764, 21</Property>
+              <Property name="Name">MCLabel1</Property>
+              <Property name="Size">53, 12</Property>
+            </Object>
+            <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCTextBox1" children="Controls">
+              <Property name="KeyDownActionList">
+                <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+              </Property>
+              <Property name="WaterMarkText" />
+              <Property name="MaxValue">0</Property>
+              <Property name="MinValue">0</Property>
+              <Property name="IsEmpty">True</Property>
+              <Property name="MCKey">LjFormulaName</Property>
+              <Property name="MCDataSourceID" />
+              <Property name="IsDbControl">False</Property>
+              <Property name="InitDataSource" />
+              <Property name="ActionDataSource" />
+              <Property name="BindDataSource" />
+              <Property name="DbOptionType">Query</Property>
+              <Property name="MCVisible">True</Property>
+              <Property name="MCEnabled">True</Property>
+              <Property name="TextName" />
+              <Property name="Location">823, 17</Property>
+              <Property name="Name">MCTextBox1</Property>
+              <Property name="Size">153, 21</Property>
+              <Property name="TabIndex">18</Property>
+            </Object>
+            <Object type="Mesnac.Controls.Default.MCCombobox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCCombobox1" children="Controls">
+              <Property name="AllowTypeAllSymbols">True</Property>
+              <Property name="ComboboxList">
+                <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL</Binary>
+              </Property>
+              <Property name="IsEmpty">True</Property>
+              <Property name="DisplayFiled" />
+              <Property name="ValueFiled" />
+              <Property name="SelectedChanged">
+                <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+              </Property>
+              <Property name="MCKey">LjFormulaKinds</Property>
+              <Property name="MCDataSourceID" />
+              <Property name="IsDbControl">False</Property>
+              <Property name="InitDataSource" />
+              <Property name="ActionDataSource" />
+              <Property name="BindDataSource">
+                <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL</Binary>
+              </Property>
+              <Property name="DbOptionType">Query</Property>
+              <Property name="MCVisible">True</Property>
+              <Property name="MCEnabled">True</Property>
+              <Property name="Location">646, 18</Property>
+              <Property name="Name">MCCombobox1</Property>
+              <Property name="Size">112, 20</Property>
+              <Property name="TabIndex">17</Property>
+            </Object>
+            <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton6" children="Controls">
+              <Property name="ClickActionList">
+                <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlCOEQyQTZBRjM4ODQ3NTRFQjE3NENBMkQwMUJENzE3BgYAAAAY5qaE6I+K6YWN5pa5566h55CG5p+l6K+iBgcAAAAY5qaE6I+K6YWN5pa5566h55CG5p+l6K+iCw==</Binary>
+              </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="MCPurview">True</Property>
+              <Property name="Format" />
+              <Property name="TextName" />
+              <Property name="NewFillColor">Red</Property>
+              <Property name="OldFillColor">DarkGray</Property>
+              <Property name="Text">查询</Property>
+              <Property name="Font">宋体, 14.25pt, style=Bold</Property>
+              <Property name="Location">982, 12</Property>
+              <Property name="Name">MCButton6</Property>
+              <Property name="Size">100, 30</Property>
+              <Property name="TabIndex">16</Property>
+            </Object>
             <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton5" children="Controls">
               <Property name="ClickActionList">
                 <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ4NkNGRDNGQTlGQjQ4NzIwRjI4MkM3NTMyMUI5NDRFBgYAAAAb5qaE6I+K6YWN5pa5566h55CG5Yid5aeL5YyWBgcAAAAb5qaE6I+K6YWN5pa5566h55CG5Yid5aeL5YyWCw==</Binary>
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml
index 560d7c2..710afed 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormPlan.xml
@@ -31,11 +31,185 @@
       <Property name="Dock">Fill</Property>
       <Property name="Location">0, 48</Property>
       <Property name="Name">MCDataGridView1</Property>
-      <Property name="Size">1007, 491</Property>
+      <Property name="Size">1161, 595</Property>
       <Property name="TabIndex">7</Property>
     </Object>
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
       <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel2" children="Controls">
+        <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton14" children="Controls">
+          <Property name="ClickActionList">
+            <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDAwNkNDMDlEMjM5N0ZENzk4RUYzQkYyQjZGQjU0OUI4BgYAAAAG5rWL6K+VBgcAAAAG5rWL6K+VCw==</Binary>
+          </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="MCPurview">False</Property>
+          <Property name="Format">
+          </Property>
+          <Property name="TextName" />
+          <Property name="NewFillColor">Red</Property>
+          <Property name="OldFillColor">DarkGray</Property>
+          <Property name="Text">测</Property>
+          <Property name="Location">693, 14</Property>
+          <Property name="Name">MCButton14</Property>
+          <Property name="Size">36, 22</Property>
+          <Property name="TabIndex">34</Property>
+        </Object>
+        <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel3" 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="TextAlign">TopCenter</Property>
+          <Property name="Text">计划状态</Property>
+          <Property name="Location">533, 18</Property>
+          <Property name="Name">MCLabel3</Property>
+          <Property name="Size">53, 12</Property>
+        </Object>
+        <Object type="Mesnac.Controls.Default.MCCombobox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCCombobox1" children="Controls">
+          <Property name="AllowTypeAllSymbols">True</Property>
+          <Property name="ComboboxList">
+            <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL</Binary>
+          </Property>
+          <Property name="IsEmpty">True</Property>
+          <Property name="DisplayFiled" />
+          <Property name="ValueFiled" />
+          <Property name="SelectedChanged">
+            <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          </Property>
+          <Property name="MCKey">PlanStatus</Property>
+          <Property name="MCDataSourceID" />
+          <Property name="IsDbControl">False</Property>
+          <Property name="InitDataSource" />
+          <Property name="ActionDataSource" />
+          <Property name="BindDataSource">
+            <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL</Binary>
+          </Property>
+          <Property name="DbOptionType">Query</Property>
+          <Property name="MCVisible">True</Property>
+          <Property name="MCEnabled">True</Property>
+          <Property name="Location">592, 15</Property>
+          <Property name="Name">MCCombobox1</Property>
+          <Property name="Size">95, 20</Property>
+          <Property name="TabIndex">31</Property>
+        </Object>
+        <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel2" 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">结束时间</Property>
+          <Property name="Location">910, 20</Property>
+          <Property name="Name">MCLabel2</Property>
+          <Property name="Size">53, 12</Property>
+        </Object>
+        <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel1" 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">开始时间</Property>
+          <Property name="Location">735, 20</Property>
+          <Property name="Name">MCLabel1</Property>
+          <Property name="Size">53, 12</Property>
+        </Object>
+        <Object type="Mesnac.Controls.Default.MCDateTimePicker, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDateTimePicker2" children="Controls">
+          <Property name="ValueChangedList">
+            <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          </Property>
+          <Property name="MCKey">enddate</Property>
+          <Property name="MCDataSourceID" />
+          <Property name="IsDbControl">False</Property>
+          <Property name="InitDataSource" />
+          <Property name="ActionDataSource" />
+          <Property name="BindDataSource" />
+          <Property name="DbOptionType">Query</Property>
+          <Property name="MCVisible">True</Property>
+          <Property name="MCEnabled">True</Property>
+          <Property name="Format">Short</Property>
+          <Property name="Location">969, 15</Property>
+          <Property name="Name">MCDateTimePicker2</Property>
+          <Property name="Size">110, 21</Property>
+          <Property name="TabIndex">28</Property>
+        </Object>
+        <Object type="Mesnac.Controls.Default.MCDateTimePicker, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDateTimePicker1" children="Controls">
+          <Property name="ValueChangedList">
+            <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
+          </Property>
+          <Property name="MCKey">startdate</Property>
+          <Property name="MCDataSourceID" />
+          <Property name="IsDbControl">False</Property>
+          <Property name="InitDataSource" />
+          <Property name="ActionDataSource" />
+          <Property name="BindDataSource" />
+          <Property name="DbOptionType">Query</Property>
+          <Property name="MCVisible">True</Property>
+          <Property name="MCEnabled">True</Property>
+          <Property name="CalendarFont">宋体, 12pt</Property>
+          <Property name="Format">Short</Property>
+          <Property name="Location">794, 15</Property>
+          <Property name="Name">MCDateTimePicker1</Property>
+          <Property name="Size">110, 21</Property>
+          <Property name="TabIndex">27</Property>
+        </Object>
+        <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton13" children="Controls">
+          <Property name="ClickActionList">
+            <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAASAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDEwRkQwMDMxQkRBNUI4QkMxNjlEOTExMDA1ODc4MkM1BgYAAAAS5p+l6K+i6K6h5YiS566h55CGBgcAAAAS5p+l6K+i6K6h5YiS566h55CGCw==</Binary>
+          </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="MCPurview">True</Property>
+          <Property name="Format" />
+          <Property name="TextName" />
+          <Property name="NewFillColor">Red</Property>
+          <Property name="OldFillColor">DarkGray</Property>
+          <Property name="Text">查询</Property>
+          <Property name="Font">宋体, 14.25pt, style=Bold</Property>
+          <Property name="Location">1085, 4</Property>
+          <Property name="Name">MCButton13</Property>
+          <Property name="Size">70, 40</Property>
+          <Property name="TabIndex">7</Property>
+        </Object>
         <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton12" children="Controls">
           <Property name="ClickActionList">
             <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw==</Binary>
@@ -214,7 +388,7 @@
         <Property name="Dock">Top</Property>
         <Property name="Location">0, 0</Property>
         <Property name="Name">Panel2</Property>
-        <Property name="Size">1007, 48</Property>
+        <Property name="Size">1161, 48</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton5" children="Controls">
         <Property name="ClickActionList">
@@ -344,7 +518,7 @@
       <Property name="Dock">Top</Property>
       <Property name="Location">0, 0</Property>
       <Property name="Name">Panel1</Property>
-      <Property name="Size">1007, 48</Property>
+      <Property name="Size">1161, 48</Property>
     </Object>
     <Property name="LoadActionList">
       <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAALAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk4NUMwMjhDNjNBNjM1NTZEMTlFMzAwMDJBMEE3QjMwBgYAAAAS5Yid5aeL6K6h5YiS566h55CGBgcAAAAS5Yid5aeL6K6h5YiS566h55CGCw==</Binary>
@@ -362,7 +536,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">1023, 578</Property>
+    <Property name="Size">1177, 682</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">榄菊计划管理</Property>
     <Property name="WindowState">Normal</Property>