diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/InitFormAction.cs index 711d98c..2e0d5fe 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/InitFormAction.cs @@ -1,7 +1,10 @@ using Mesnac.Action.Base; using Mesnac.Controls.Base; +using Mesnac.Controls.Default; + using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -33,6 +36,24 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; startdate.MCValue = DateTime.Now.AddDays(-3); + + var MCCombobox1 = GetAllControls().FirstOrDefault(x => x.Name == "MCCombobox1") as MCCombobox; + DataTable dataTable = new DataTable(); + + dataTable.Columns.Add("CmbValue", typeof(string)); + dataTable.Columns.Add("CmbDisplay", typeof(string)); + + + + for (int i = 1; i < 5; i++) + { + var dr = dataTable.NewRow(); + dr[0] = i; + dr[1] = i; + dataTable.Rows.Add(dr); + } + MCCombobox1.DataSource=dataTable; + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectAction.cs index b5a5f75..619c584 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectAction.cs @@ -1,6 +1,8 @@ using Mesnac.Action.Base; using Mesnac.Codd.Session; using Mesnac.Controls.Base; +using Mesnac.Controls.Default; + using System; using System.Collections.Generic; using System.Data; @@ -21,6 +23,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer base.RunIni(runtime); //必须要调用的 + var MCCombobox1 = GetAllControls().FirstOrDefault(x => x.Name == "MCCombobox1") as MCCombobox; ICSharpCode.Core.LoggingService.Debug("干混机报表-查询..."); DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); @@ -58,6 +61,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer ICSharpCode.Core.LoggingService.Debug("{干混机报表-查询} 缺少key值为enddate或者enddate的时间查询条件..."); return; } + + //MCCombobox1 + + sbSql.Append(" and dryNo=" + MCCombobox1.MCValue); + sbSql.Append(" ORDER BY recordTime desc"); dbHelper.CommandText = sbSql.ToString(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs index 837d8d1..8a40c3e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs @@ -1,6 +1,8 @@ using Mesnac.Action.Base; using Mesnac.Codd.Session; +using Mesnac.Controls.Default; + using System; using System.Collections.Generic; using System.Data; @@ -22,6 +24,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer { base.RunIni(runtime); //必须要调用的 + var MCCombobox1 = GetAllControls().FirstOrDefault(x => x.Name == "MCCombobox1") as MCCombobox; ICSharpCode.Core.LoggingService.Debug("干混机报表-明细查询..."); //获取报表数据 @@ -102,6 +105,8 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer clientGrid.DataSource = table; + + dbHelper.ClearParameter(); string sql = $"select t1.mixBatch as 批次,t1.mixStep as 步号,t2.ActionName as 动作,t1.mixTime as 时间,t1.mixTemp as 温度,t1.mixSpeed as 速度 from Report_DryMixer_Detail t1\r\nleft join ActionCode t2 on t2.Code=t1.actCode\r\nwhere t2.DeviceUnitId=1 and t1.reportId='{lR_planID}' order by actCode"; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/InitFormAction.cs index 211cc6d..2eee229 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/InitFormAction.cs @@ -1,7 +1,10 @@ using Mesnac.Action.Base; using Mesnac.Controls.Base; +using Mesnac.Controls.Default; + using System; using System.Collections.Generic; +using System.Data; using System.Linq; namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser @@ -30,6 +33,28 @@ namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; startdate.MCValue = DateTime.Now.AddDays(-3); + + var MCCombobox1 = GetAllControls().FirstOrDefault(x => x.Name == "MCCombobox1") as MCCombobox; + + + DataTable dataTable = new DataTable(); + + dataTable.Columns.Add("CmbValue", typeof(string)); + dataTable.Columns.Add("CmbDisplay", typeof(string)); + + + + for (int i = 1; i < 9; i++) + { + var dr = dataTable.NewRow(); + dr[0] = i; + dr[1] = i; + dataTable.Rows.Add(dr); + } + + + MCCombobox1.DataSource = dataTable; + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectAction.cs index ec338bd..f117582 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectAction.cs @@ -1,6 +1,8 @@ using Mesnac.Action.Base; using Mesnac.Codd.Session; using Mesnac.Controls.Base; +using Mesnac.Controls.Default; + using System; using System.Collections.Generic; using System.Data; @@ -31,7 +33,8 @@ namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser } dbHelper.ClearParameter(); - StringBuilder sbSql = new StringBuilder(@" select objId, gelNo, recordTime, reportId, recipeCode, recipeName, planCode, planName, Batch from Report_Gel + StringBuilder sbSql = new StringBuilder(@" select objId, gelNo, recordTime, reportId, recipeCode, recipeName, planCode, planName, + Batch from Report_Gel where 1=1"); List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 @@ -60,6 +63,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser ICSharpCode.Core.LoggingService.Debug("{糊化机报表-查询} 缺少key值为enddate或者enddate的时间查询条件..."); return; } + + var MCCombobox1 = GetAllControls().FirstOrDefault(x => x.Name == "MCCombobox1") as MCCombobox; + + sbSql.Append(" and gelNo=" + MCCombobox1.MCValue); + sbSql.Append(" ORDER BY recordTime desc"); dbHelper.CommandText = sbSql.ToString(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectRowAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectRowAction.cs index 4ae803a..3d7d001 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectRowAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectRowAction.cs @@ -90,6 +90,13 @@ namespace Mesnac.Action.ChemicalWeighing.Report.GelDoser } dbHelper.ClearParameter(); + + var tableNew=new DataTable(); + tableNew.Columns.Add("批次号", typeof(string)); + tableNew.Columns.Add("物料", typeof(string)); + tableNew.Columns.Add("实际重量", typeof(string)); + tableNew.Columns.Add("实际公差", typeof(string)); + //获取明细数据 StringBuilder sqlStr = new StringBuilder(@"select t1.batch as 批次号,t2.MName as 物料, t1.actValue as 实际重量,t1.actToler as 实际公差 @@ -101,34 +108,133 @@ t1.actValue as 实际重量,t1.actToler as 实际公差 dbHelper.CommandType = System.Data.CommandType.Text; dbHelper.AddParameter("@reportId", lR_planID); DataTable table = dbHelper.ToDataTable(); + foreach (DataRow item in table.Rows) + { + var dr = tableNew.NewRow(); + dr["批次号"] = item["批次号"]; + dr["物料"] = item["物料"]; + dr["实际重量"] = Convert.ToSingle(item["实际重量"]).ToString("#0.00"); + dr["实际公差"] = Convert.ToSingle(item["实际公差"]).ToString("#0.00"); + tableNew.Rows.Add(dr); + } //水 这个奇葩的设计 - string sql = $"select t1.batch as 批次号,t2.MName as 物料,\r\nt1.actValue as 实际重量,t1.actToler as 实际公差\r\n from Report_GelDoser_Detail t1\r\n left join lj_stock_material t2 on t1.matCode = t2.Code\r\n where t2.MTypeId=4 and t1.kinds <> 1 and t1.reportId='{lR_planID}'"; + string sql = $"select t1.batch as 批次号,t2.MName as 物料,\r\nt1.actValue as 实际重量" + + $",t1.actToler as 实际公差 , t1.kinds \r\n from Report_GelDoser_Detail t1\r\n " + + $"left join lj_stock_material t2 on t1.matCode = t2.Code\r\n where t1.kinds <> 1 and t1.reportId='{lR_planID}'"; dbHelper.CommandText = sql.ToString(); dbHelper.CommandType = System.Data.CommandType.Text; DataTable table1 = dbHelper.ToDataTable(); - foreach (DataRow row in table1.Rows ) + foreach (System.Data.DataColumn col in table1.Columns) + { + col.ReadOnly = false; + } + + foreach (DataRow row in table1.Rows ) { - table.Rows.Add( row.ItemArray ); + var kinds=row["kinds"].ToString(); + if (kinds == "2") + { + row["物料"] = "热水"; + } + else + { + row["物料"] = "冷水"; + } + + var dr = tableNew.NewRow(); + dr["批次号"] = row["批次号"]; + dr["物料"] = row["物料"]; + dr["实际重量"] = Convert.ToSingle(row["实际重量"]).ToString("#0.00"); + dr["实际公差"] = Convert.ToSingle(row["实际公差"]).ToString("#0.00"); + tableNew.Rows.Add(dr); } - clientGrid.DataSource = table; + clientGrid.DataSource = tableNew; - sql = $"select t1. mixBatch as 批次,t1.mixStep as 步号,t2.ActionName as 动作,\r\n\t\t t1.mixTime as 时间,t1.mixTemp as 温度,t1.mixSpeed as 速度,t1.recordTime as 记录时间\r\n from Report_GelMixing_Detail t1\r\n left join ActionCode t2 on t1.actCode =t2.Code\r\n\r\n where t2.DeviceUnitId=2 and t1.reportId ='{lR_planID}'\r\n\r\n order by t1.actCode"; + sql = $"select t1.actCode, t1. mixBatch as 批次,t1.mixStep as 步号,t2.ActionName as 动作,\r\n\t\t " + + $" t1.mixTime as 时间,t1.mixTemp as 温度,t1.mixSpeed as 速度,t1.recordTime as 记录时间\r\n " + + $" from Report_GelMixing_Detail t1\r\n " + + $" left join ActionCode t2 on t1.actCode =t2.Code\r\n\r\n " + + $" where t2.DeviceUnitId=2 and t1.reportId ='{lR_planID}'\r\n\r\n " + + $"" + + $" order by t1.actCode"; dbHelper.CommandText = sql.ToString(); dbHelper.CommandType = System.Data.CommandType.Text; DataTable table2 = dbHelper.ToDataTable(); - clientGrid2.DataSource = table2; + var tableNewB=new DataTable(); + 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)); + + foreach (System.Data.DataRow row in table2.Rows) + { + + row["速度"] = Convert.ToSingle(row["速度"]).ToString("#0.00"); + row["动作"] = GelStepConvert(Convert.ToInt32(row["actCode"])); + + var dr = tableNewB.NewRow(); + dr["批次"] = row["批次"]; + dr["步号"] = row["步号"]; + dr["动作"] = row["动作"]; + dr["时间"] = ConverToTime(Convert.ToInt32(row["时间"])); + dr["温度"] = row["温度"]; + dr["速度"] = row["速度"]; + dr["记录时间"] = row["记录时间"]; + tableNewB.Rows.Add(dr); + } + + + clientGrid2.DataSource = tableNewB; + + } + + string ConverToTime(int duration) + { + TimeSpan ts = new TimeSpan(0, 0, Convert.ToInt32(duration)); + string str = ""; + if (ts.Hours > 0) + { + str = ts.Hours.ToString() + "小时 " + ts.Minutes.ToString() + "分钟 " + ts.Seconds + "秒"; + } + if (ts.Hours == 0 && ts.Minutes > 0) + { + str = ts.Minutes.ToString() + "分钟 " + ts.Seconds + "秒"; + } + if (ts.Hours == 0 && ts.Minutes == 0) + { + str = ts.Seconds + "秒"; + } + return str; + } + + string GelStepConvert(int code) + { + switch (code) + { + case 1: return "加冷水"; + case 2: return "加粉料"; + case 3: return "搅拌"; + case 4: return "加热水"; + case 5: return "时间控制"; + case 6: return "等待确认"; + case 7: return "排料等待"; + default: return "无"; + } } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs index 3eebc56..bb63d6a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ReportReadDb.cs @@ -366,9 +366,15 @@ namespace Mesnac.Action.ChemicalWeighing.Report } } - FreeSqlUnit.Instance.Insert(dry).ExecuteAffrows(); - FreeSqlUnit.Instance.Insert(lsDos).ExecuteAffrows(); - FreeSqlUnit.Instance.Insert(lsMix).ExecuteAffrows(); + if (lsDos.Any()) + { + dry.Batch=lsDos.Select(x=>x.batch).First(); + FreeSqlUnit.Instance.Insert(dry).ExecuteAffrows(); + FreeSqlUnit.Instance.Insert(lsDos).ExecuteAffrows(); + FreeSqlUnit.Instance.Insert(lsMix).ExecuteAffrows(); + + } + } @@ -411,6 +417,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report gelDb.planCode = 0; gelDb.planName = ""; gelDb.recordTime = DateTime.Now; + gelDb.gelNo = no; gelDb.Batch = 0; @@ -499,9 +506,15 @@ namespace Mesnac.Action.ChemicalWeighing.Report } - FreeSqlUnit.Instance.Insert(gelDb).ExecuteAffrows(); - FreeSqlUnit.Instance.Insert(lsdetail).ExecuteAffrows(); - FreeSqlUnit.Instance.Insert(lsMixing).ExecuteAffrows(); + if(null!= lsdetail && lsdetail.Any()) + { + gelDb.Batch = lsdetail.Select(x => x.batch).FirstOrDefault(); + + FreeSqlUnit.Instance.Insert(gelDb).ExecuteAffrows(); + FreeSqlUnit.Instance.Insert(lsdetail).ExecuteAffrows(); + FreeSqlUnit.Instance.Insert(lsMixing).ExecuteAffrows(); + } + } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/WetMixer/SelectRowAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/WetMixer/SelectRowAction.cs index 8ccb5c8..5343e1f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/WetMixer/SelectRowAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/WetMixer/SelectRowAction.cs @@ -77,7 +77,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.WetMixer dbHelper.ClearParameter(); //获取明细数据 - StringBuilder sqlStr = new StringBuilder(@" select t1. mixBatch as 批次,t1.mixStep as 步号,t2.ActionName as 动作, + StringBuilder sqlStr = new StringBuilder(@" select t1.actCode, t1. mixBatch as 批次,t1.mixStep as 步号,t2.ActionName as 动作, t1.mixTime as 时间,t1.mixTemp as 温度,t1.mixSpeed as 速度,t1.recordTime as 记录时间 from Report_WetMixer_Detail t1 left join ActionCode t2 on t1.actCode =t2.Code @@ -90,8 +90,73 @@ namespace Mesnac.Action.ChemicalWeighing.Report.WetMixer dbHelper.AddParameter("@reportId", lR_planID); DataTable table = dbHelper.ToDataTable(); - clientGrid.DataSource = table; + + var tableNew=new DataTable(); + tableNew.Columns.Add("批次", typeof(string)); + tableNew.Columns.Add("步号", typeof(string)); + tableNew.Columns.Add("动作", typeof(string)); + tableNew.Columns.Add("时间", typeof(string)); + tableNew.Columns.Add("温度", typeof(string)); + tableNew.Columns.Add("速度", typeof(string)); + tableNew.Columns.Add("记录时间", typeof(string)); + foreach (System.Data.DataRow row in table.Rows) + { + + row["速度"] = Convert.ToSingle(row["速度"]).ToString("#0.00"); + row["动作"] = WetStepConvert(Convert.ToInt32(row["actCode"])); + + + var dr=tableNew.NewRow(); + dr["批次"] = row["批次"]; + dr["步号"] = row["步号"]; + dr["动作"] = row["动作"]; + dr["时间"] = ConverToTime(Convert.ToInt32(row["时间"])); + dr["温度"] = row["温度"]; + dr["速度"] = row["速度"]; + dr["记录时间"] = row["记录时间"]; + tableNew.Rows.Add(dr); + } + + + clientGrid.DataSource = tableNew; + } + + + string ConverToTime(int duration) + { + TimeSpan ts = new TimeSpan(0, 0, Convert.ToInt32(duration)); + string str = ""; + if (ts.Hours > 0) + { + str = ts.Hours.ToString() + "小时 " + ts.Minutes.ToString() + "分钟 " + ts.Seconds + "秒"; + } + if (ts.Hours == 0 && ts.Minutes > 0) + { + str = ts.Minutes.ToString() + "分钟 " + ts.Seconds + "秒"; + } + if (ts.Hours == 0 && ts.Minutes == 0) + { + str = ts.Seconds + "秒"; + } + return str; + } + + /// + /// 湿混机步骤代码转换为步骤名 + /// + string WetStepConvert(int code) + { + switch (code) + { + case 1: return "调糊化料"; + case 2: return "下干料"; + case 3: return "搅拌"; + case 4: return "等待确认"; + case 5: return "排料等待"; + default: return "无"; + } } } } + } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/Report_DryMixer.xml b/Main/MCEdit/Data/MCProject/nodeForm/Report_DryMixer.xml index eeb745a..acbda79 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/Report_DryMixer.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/Report_DryMixer.xml @@ -70,29 +70,27 @@ True - AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAQAAAAcAAAAHAwAAAAABAAAABAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAJBAAAAA0DBQQAAAAlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAIY21iVmFsdWUKY21iRGlzcGxheQEBAgAAAAYFAAAABuWFqOmDqAYGAAAABuWFqOmDqAs= + AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL True - Name - Id + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - [DataSource1].[Device].[Id] - MCDataSource1 + + False - select * from Device where Name LIKE '干混%' + - - AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L - - Query + + None True True - 779, 28 + 780, 26 MCCombobox1 - 69, 24 - 59 + 121, 24 + 63 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml b/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml index 0b317d6..c7ae734 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/糊化机报表.xml @@ -26,7 +26,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAAgBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANDQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAAKcmVjb3JkVGltZQYIAAAADOaKpeihqOaXtumXtAEFAAAABAAAAAYJAAAABVdldE5vBgoAAAAG5py65Y+wAQYAAAAEAAAABgsAAAAFQmF0Y2gGDAAAAAbovabmrKEL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAAwBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANDQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAAKcmVjb3JkVGltZQYIAAAADOaKpeihqOaXtumXtAEFAAAABAAAAAYJAAAABWdlbE5vBgoAAAAG5py65Y+wAQYAAAAEAAAABgsAAAAFQmF0Y2gGDAAAAAbovabmrKEL AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -70,29 +70,29 @@ True - AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAQAAAAcAAAAHAwAAAAABAAAABAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAJBAAAAA0DBQQAAAAlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAIY21iVmFsdWUKY21iRGlzcGxheQEBAgAAAAYFAAAABuWFqOmDqAYGAAAABuWFqOmDqAs= + AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL True - Name - Id + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - [DataSource1].[Device].[Id] - MCDataSource1 + + False - select * from Device where Name LIKE '干混%' + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L - Query + None True True 779, 28 MCCombobox1 - 69, 24 - 59 + 90, 24 + 63