干混机

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs

@@ -620,7 +620,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
                 begin += 10;
             }
         
-            //begin += 120;
+           
             for (int i = 0; i < recipeSteps.Count(); i++)
             {
                 var view = recipeSteps[i];

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

@@ -1,5 +1,7 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FormGhWuLiao" 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="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel3" children="Controls">
         <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">
@@ -27,11 +29,18 @@
           <Property name="MCEnabled">True</Property>
           <Property name="AutoGenerateColumns">False</Property>
           <Property name="MultiSelect">False</Property>
-      <Property name="Location">12, 82</Property>
+          <Property name="Dock">Fill</Property>
+          <Property name="Location">0, 0</Property>
           <Property name="Name">MCDataGridView1</Property>
-      <Property name="Size">1283, 591</Property>
+          <Property name="Size">1171, 619</Property>
           <Property name="TabIndex">12</Property>
         </Object>
+        <Property name="Dock">Fill</Property>
+        <Property name="Location">0, 77</Property>
+        <Property name="Name">Panel3</Property>
+        <Property name="Size">1171, 619</Property>
+      </Object>
+      <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel2" children="Controls">
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox1" children="Controls">
           <Object type="Mesnac.Controls.Default.MCDateTimePicker, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="endTime" children="Controls">
             <Property name="ValueChangedList">
@@ -137,11 +146,21 @@
           </Object>
           <Property name="TabStop">False</Property>
           <Property name="Text">统计查询</Property>
-      <Property name="Location">12, 12</Property>
+          <Property name="Location">9, 3</Property>
           <Property name="Name">GroupBox1</Property>
-      <Property name="Size">1283, 64</Property>
+          <Property name="Size">868, 64</Property>
           <Property name="TabIndex">11</Property>
         </Object>
+        <Property name="Dock">Top</Property>
+        <Property name="Location">0, 0</Property>
+        <Property name="Name">Panel2</Property>
+        <Property name="Size">1171, 77</Property>
+      </Object>
+      <Property name="Dock">Fill</Property>
+      <Property name="Location">0, 0</Property>
+      <Property name="Name">Panel1</Property>
+      <Property name="Size">1171, 696</Property>
+    </Object>
     <Property name="LoadActionList">
       <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEIzQjEyQ0QxNzdGNDc4RDc4QzM4QTc5RkIyMDY0NTcwBgYAAAAb5bmy5re35py654mp5paZ55So6YeP57uf6K6hBgcAAAAb5bmy5re35py654mp5paZ55So6YeP57uf6K6hCw==</Binary>
     </Property>
@@ -158,7 +177,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">1334, 735</Property>
+    <Property name="Size">1187, 735</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">干混机物料用量报表</Property>
     <Property name="WindowState">Normal</Property>