周日提交

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs

@@ -198,8 +198,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum
             }
             
             #endregion
-
-
+            
             _tankNumCodingView.MTypeId = Convert.ToInt32(this.comboBox1.SelectedValue);
             _tankNumCodingView.High = Convert.ToSingle(High.Text);
             _tankNumCodingView.Slow = Convert.ToSingle(Slow.Text);

Main/MCEdit/Data/MCProject/nodeDevice.xml

@@ -13,7 +13,7 @@
       </Connection>
     </Main>
     <Group>
-      <Group name="B1" block="1165" start="0" len="1130" access="ReadWrite" remark="ParametersWithPc" isautoread="True">
+      <Group name="B1" block="1165" start="0" len="1130" access="ReadWrite" remark="ParametersWithPc" isautoread="False">
         <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_Div()" max="" issave="False" subtractor="" remark="系统通用参数" />
@@ -1421,7 +1421,7 @@
           <Data name="weightPraHoper4_JogTime" runname="weightPraHoper4_JogTime" start="1128" len="2" method="Default_Div()" max="" issave="False" subtractor="" remark="点动动动" />
         </Data>
       </Group>
-      <Group name="reportDataToPC" block="146" start="0" len="2504" access="ReadWrite" remark="reportDataToPC" isautoread="True">
+      <Group name="reportDataToPC" block="146" start="0" len="2504" access="ReadWrite" remark="reportDataToPC" isautoread="False">
         <Data>
           <Data name="dryerA_dos0_eqNo" runname="dryerA_dos0_eqNo" start="0" len="1" method="Default_Div()" max="" issave="False" subtractor="" remark="设备编号" />
           <Data name="dryerA_dos0_batch" runname="dryerA_dos0_batch" start="1" len="1" method="Default_Div()" max="" issave="False" subtractor="" remark="批次号" />
@@ -3273,7 +3273,7 @@
           <Data name="wetMixingH_9_mixSpeed" runname="wetMixingH_9_mixSpeed" start="2502" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="速度" />
         </Data>
       </Group>
-      <Group name="RecipeDataFromPC" block="4" start="0" len="1710" access="ReadWrite" remark="" isautoread="True">
+      <Group name="RecipeDataFromPC" block="4" start="0" len="1710" access="ReadWrite" remark="" isautoread="False">
         <Data>
           <Data name="FirstWord" runname="FirstWord" start="0" len="1" method="Default_Div()" max="" issave="False" subtractor="" remark="预留" />
           <Data name="recipeCode" runname="recipeCode" start="1" len="1" method="Default_Div()" max="" issave="False" subtractor="" remark="配方代码" />

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

@@ -155,7 +155,7 @@
     <Property name="BackColor">Control</Property>
     <Property name="Size">712, 426</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
-    <Property name="Text">物料大类</Property>
+    <Property name="Text">物料</Property>
     <Property name="WindowState">Normal</Property>
     <Property name="BackgroundImage" />
     <Property name="BackgroundImageLayout">Tile</Property>

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

@@ -3,7 +3,7 @@
     <Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
       <Property name="DisplayAllColumn">False</Property>
       <Property name="DgvColumn">
-        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACQAAAJcAAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAANBwUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABg0AAAACaWQGDgAAAAbluo/lj7cBBQAAAAQAAAAGDwAAAARDb2RlBhAAAAAM5paZ5LuT57yW56CBAQYAAAAEAAAABhEAAAAJU3RvY2tOYW1lBhIAAAAM5paZ5LuT5ZCN56ewAQcAAAAEAAAABhMAAAAQTWF0ZXJpYWxUeXBlTmFtZQYUAAAABueJqeaWmQEIAAAABAAAAAYVAAAABEhpZ2gGFgAAABLpq5jpgJ/np7Dph4/pgJ/luqYBCQAAAAQAAAAGFwAAAARTbG93BhgAAAAS5oWi6YCf56ew6YeP6YCf5bqmAQoAAAAEAAAABhkAAAAJU2xvd1NjYWxlBhoAAAAJ5oWi56ew5YC8AQsAAAAEAAAABhsAAAAETGVhZAYcAAAACeaPkOWJjemHjwEMAAAABAAAAAYdAAAAA0pvZwYeAAAACeeCueWKqOWAvAs=</Binary>
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACgAAAK0AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAA0GBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGDgAAAAJpZAYPAAAABuW6j+WPtwEFAAAABAAAAAYQAAAABENvZGUGEQAAAAzmlpnku5PnvJbnoIEBBgAAAAQAAAAGEgAAAAlTdG9ja05hbWUGEwAAAAzmlpnku5PlkI3np7ABBwAAAAQAAAAGFAAAABBNYXRlcmlhbFR5cGVOYW1lBhUAAAAG54mp5paZAQgAAAAEAAAABhYAAAAESGlnaAYXAAAAEumrmOmAn+ensOmHj+mAn+W6pgEJAAAABAAAAAYYAAAABFNsb3cGGQAAABLmhaLpgJ/np7Dph4/pgJ/luqYBCgAAAAQAAAAGGgAAAAlTbG93U2NhbGUGGwAAAAnmhaLnp7DlgLwBCwAAAAQAAAAGHAAAAARMZWFkBh0AAAAJ5o+Q5YmN6YePAQwAAAAEAAAABh4AAAADSm9nBh8AAAAJ54K55Yqo5YC8AQ0AAAAEAAAABiAAAAANU3RvY2tUeXBlTmFtZQYhAAAABuexu+WIqws=</Binary>
       </Property>
       <Property name="ClickActionList">
         <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>