yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

糊化机 优化

Browse Source
dep
我叫锄头 11 months ago
parent 543d4fc9c3
commit 1e0a307371
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File

7
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectAction.cs
Unescape Escape View File

@ -83,6 +83,13 @@ namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser
return; return;
} }
_dgvGelDoser.BaseControl.BindDataSource = table; _dgvGelDoser.BaseControl.BindDataSource = table;
Mesnac.Controls.Default.MultiColHeaderDgv clientGrid2 =
(GetAllControls().Where(x => x.Name.Contains("MultiColHeaderDgv2")).FirstOrDefault() as Mesnac.Controls.Default.MultiColHeaderDgv);
clientGrid2.DataSource = null;
var clientGrid1= GetAllControls().Where(x => x.Name.Contains("MultiColHeaderDgv1")).FirstOrDefault() as Mesnac.Controls.Default.MultiColHeaderDgv;
clientGrid1.DataSource = null;
} }
} }
} }

7
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectRowAction.cs
Unescape Escape View File

@ -177,7 +177,7 @@ t1.actValue as 实际重量,t1.actToler as 实际公差
tableNewB.Columns.Add("步号", typeof(string)); tableNewB.Columns.Add("步号", typeof(string));
tableNewB.Columns.Add("动作", typeof(string)); tableNewB.Columns.Add("动作", typeof(string));
tableNewB.Columns.Add("时间", typeof(string)); tableNewB.Columns.Add("时间", typeof(string));
tableNewB.Columns.Add("温度", typeof(string)); //tableNewB.Columns.Add("温度", typeof(string));
tableNewB.Columns.Add("速度", typeof(string)); tableNewB.Columns.Add("速度", typeof(string));
tableNewB.Columns.Add("记录时间", typeof(string)); tableNewB.Columns.Add("记录时间", typeof(string));
@ -192,15 +192,16 @@ t1.actValue as 实际重量,t1.actToler as 实际公差
dr["步号"] = row["步号"]; dr["步号"] = row["步号"];
dr["动作"] = row["动作"]; dr["动作"] = row["动作"];
dr["时间"] = ConverToTime(Convert.ToInt32(row["时间"])); dr["时间"] = ConverToTime(Convert.ToInt32(row["时间"]));
dr["温度"] = row["温度"]; //dr["温度"] = row["温度"];
dr["速度"] = row["速度"]; dr["速度"] = row["速度"];
dr["记录时间"] = row["记录时间"]; dr["记录时间"] = row["记录时间"];
tableNewB.Rows.Add(dr); tableNewB.Rows.Add(dr);
} }
clientGrid2.DataSource = null;
clientGrid2.DataSource = tableNewB; clientGrid2.DataSource = tableNewB;
} }
string ConverToTime(int duration) string ConverToTime(int duration)

2
Main/MCEdit/Data/MCProject/nodeDataSource.xml
Unescape Escape View File

@ -1,3 +1,3 @@
<DataSources> <DataSources>
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" /> <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="172.18.4.130" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
</DataSources> </DataSources>

8
Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
Unescape Escape View File

@ -2632,7 +2632,7 @@
<Property name="Text">0</Property> <Property name="Text">0</Property>
<Property name="Font">宋体, 12pt</Property> <Property name="Font">宋体, 12pt</Property>
<Property name="ForeColor">ButtonHighlight</Property> <Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">1752, 542</Property> <Property name="Location">1751, 542</Property>
<Property name="Name">ValueWeight4</Property> <Property name="Name">ValueWeight4</Property>
<Property name="Size">16, 16</Property> <Property name="Size">16, 16</Property>
</Object> </Object>
@ -2653,7 +2653,7 @@
<Property name="Text">0</Property> <Property name="Text">0</Property>
<Property name="Font">宋体, 12pt</Property> <Property name="Font">宋体, 12pt</Property>
<Property name="ForeColor">ButtonHighlight</Property> <Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">1443, 542</Property> <Property name="Location">1440, 542</Property>
<Property name="Name">ValueWeight3</Property> <Property name="Name">ValueWeight3</Property>
<Property name="Size">16, 16</Property> <Property name="Size">16, 16</Property>
</Object> </Object>
@ -2674,7 +2674,7 @@
<Property name="Text">0</Property> <Property name="Text">0</Property>
<Property name="Font">宋体, 12pt</Property> <Property name="Font">宋体, 12pt</Property>
<Property name="ForeColor">ButtonHighlight</Property> <Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">1201, 542</Property> <Property name="Location">1198, 541</Property>
<Property name="Name">ValueWeight2</Property> <Property name="Name">ValueWeight2</Property>
<Property name="Size">16, 16</Property> <Property name="Size">16, 16</Property>
</Object> </Object>
@ -2695,7 +2695,7 @@
<Property name="Text">0</Property> <Property name="Text">0</Property>
<Property name="Font">宋体, 12pt</Property> <Property name="Font">宋体, 12pt</Property>
<Property name="ForeColor">ButtonHighlight</Property> <Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">894, 542</Property> <Property name="Location">891, 542</Property>
<Property name="Name">ValueWeight1</Property> <Property name="Name">ValueWeight1</Property>
<Property name="Size">16, 16</Property> <Property name="Size">16, 16</Property>
</Object> </Object>

12
Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml
Unescape Escape View File

@ -3,15 +3,15 @@
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox3" children="Controls"> <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox3" children="Controls">
<Object type="Mesnac.Controls.Default.MultiColHeaderDgv, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MultiColHeaderDgv2" children="Controls"> <Object type="Mesnac.Controls.Default.MultiColHeaderDgv, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MultiColHeaderDgv2" children="Controls">
<Property name="Dock">Fill</Property> <Property name="Dock">Fill</Property>
<Property name="Location">583, 22</Property> <Property name="Location">421, 22</Property>
<Property name="Name">MultiColHeaderDgv2</Property> <Property name="Name">MultiColHeaderDgv2</Property>
<Property name="Size">601, 352</Property> <Property name="Size">763, 352</Property>
</Object> </Object>
<Object type="Mesnac.Controls.Default.MultiColHeaderDgv, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MultiColHeaderDgv1" children="Controls"> <Object type="Mesnac.Controls.Default.MultiColHeaderDgv, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MultiColHeaderDgv1" children="Controls">
<Property name="Dock">Left</Property> <Property name="Dock">Left</Property>
<Property name="Location">3, 22</Property> <Property name="Location">3, 22</Property>
<Property name="Name">MultiColHeaderDgv1</Property> <Property name="Name">MultiColHeaderDgv1</Property>
<Property name="Size">580, 352</Property> <Property name="Size">418, 352</Property>
</Object> </Object>
<Property name="TabStop">False</Property> <Property name="TabStop">False</Property>
<Property name="Text">报表明细</Property> <Property name="Text">报表明细</Property>
@ -26,7 +26,7 @@
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" 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="DisplayAllColumn">False</Property>
<Property name="DgvColumn"> <Property name="DgvColumn">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAAwBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANDQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAAKcmVjb3JkVGltZQYIAAAADOaKpeihqOaXtumXtAEFAAAABAAAAAYJAAAABWdlbE5vBgoAAAAG5py65Y+wAQYAAAAEAAAABgsAAAAFQmF0Y2gGDAAAAAbovabmrKEL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAABQBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANDQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAAFZ2VsTm8GCAAAAAbmnLrlj7ABBQAAAAQAAAAGCQAAAAVCYXRjaAYKAAAABuaJueasoQEGAAAABAAAAAYLAAAACnJlY29yZFRpbWUGDAAAAAzmiqXooajml7bpl7QL</Binary>
</Property> </Property>
<Property name="ClickActionList"> <Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@ -84,7 +84,7 @@
<Property name="InitDataSource" /> <Property name="InitDataSource" />
<Property name="ActionDataSource" /> <Property name="ActionDataSource" />
<Property name="BindDataSource"> <Property name="BindDataSource">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L</Binary> <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL</Binary>
</Property> </Property>
<Property name="DbOptionType">None</Property> <Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property> <Property name="MCVisible">True</Property>
@ -125,7 +125,7 @@
<Property name="ActionDataSource" /> <Property name="ActionDataSource" />
<Property name="BindDataSource" /> <Property name="BindDataSource" />
<Property name="DbOptionType">None</Property> <Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property> <Property name="MCVisible">False</Property>
<Property name="MCEnabled">True</Property> <Property name="MCEnabled">True</Property>
<Property name="MCPurview">True</Property> <Property name="MCPurview">True</Property>
<Property name="Format" /> <Property name="Format" />

Write Preview
Loading…
Cancel
Save