diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/Export.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/Export.cs index 3ef8728..4ca1352 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/Export.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/Export.cs @@ -110,19 +110,33 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport int row = 2; foreach (DataRow item in dt1.Rows) { - worksheet.Cells[row, 1] = item[0]; - worksheet.Cells[row, 2] = item[1]; - worksheet.Cells[row, 3] = item[2]; - worksheet.Cells[row, 4] = item[4]; - worksheet.Cells[row, 5] = item[6]; - worksheet.Cells[row, 6] = item[7]; - worksheet.Cells[row, 7] = item[8]; - worksheet.Cells[row, 8] = item[9]; - worksheet.Cells[row, 9] = item[14]; - worksheet.Cells[row, 10] = item[11]; - worksheet.Cells[row, 11] = item[12]; - worksheet.Cells[row, 12] = item[21]; - worksheet.Cells[row, 13] = item[22]; + worksheet.Cells[row, 1].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 2].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 3].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 4].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 5].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 6].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 7].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 8].EntireColumn.NumberFormat = "@"; worksheet.Cells[row, 8].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 9].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 10].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 11].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 12].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 13].EntireColumn.NumberFormat = "@"; + + worksheet.Cells[row, 1] = item[0].ToString(); + worksheet.Cells[row, 2] = item[1].ToString(); + worksheet.Cells[row, 3] = item[2].ToString(); + worksheet.Cells[row, 4] = item[4].ToString(); + worksheet.Cells[row, 5] = item[6].ToString(); + worksheet.Cells[row, 6] = item[7].ToString(); + worksheet.Cells[row, 7] = item[8].ToString(); + worksheet.Cells[row, 8] = item[9].ToString(); + worksheet.Cells[row, 9] = item[14].ToString(); + worksheet.Cells[row, 10] = item[11].ToString(); + worksheet.Cells[row, 11] = item[12].ToString(); + worksheet.Cells[row, 12] = item[21].ToString(); + worksheet.Cells[row, 13] = item[22].ToString(); row++; } System.Runtime.InteropServices.Marshal.ReleaseComObject(worksheet); @@ -138,10 +152,15 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport int row = 2; foreach (DataRow item in dt2.Rows) { - worksheet.Cells[row, 1] = item[2]; - worksheet.Cells[row, 2] = item[3]; - worksheet.Cells[row, 3] = item[4]; - worksheet.Cells[row, 4] = item[5]; + worksheet.Cells[row, 1].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 2].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 3].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 4].EntireColumn.NumberFormat = "@"; + + worksheet.Cells[row, 1] = item[2].ToString(); + worksheet.Cells[row, 2] = item[3].ToString(); + worksheet.Cells[row, 3] = item[4].ToString(); + worksheet.Cells[row, 4] = item[5].ToString(); row++; } System.Runtime.InteropServices.Marshal.ReleaseComObject(worksheet); @@ -160,6 +179,14 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport int row = 2; foreach (DataRow item in dt3.Rows) { + worksheet.Cells[row, 1].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 2].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 3].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 4].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 5].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 6].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 7].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 1] = item[2]; worksheet.Cells[row, 2] = item[6]; worksheet.Cells[row, 3] = item[4]; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/InitFormAction.cs index 2d3c18f..e0c0f5c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/InitFormAction.cs @@ -25,10 +25,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport ICSharpCode.Core.LoggingService.Debug("生产报表-窗体初始化..."); List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 - IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; - IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; - starttime.MCValue = DateTime.Parse("00:00:00"); - endtime.MCValue = DateTime.Parse("23:59:59"); + //IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; + //IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; + //starttime.MCValue = DateTime.Parse("00:00:00"); + //endtime.MCValue = DateTime.Parse("23:59:59"); var comRecipe = base.GetControlById("comRecipe") as System.Windows.Forms.ComboBox;//配方名称 if (comRecipe != null) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/SelectPlanAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/SelectPlanAction.cs index 3685e14..99c7c9f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/SelectPlanAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/SelectPlanAction.cs @@ -48,29 +48,29 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport from xl_plan p left join xl_recipe r on p.Recipe_ID=r.ID) t left join ( select ID,Dosing_Id,Plan_Id, Real_Num,SUM(Total_Weight) as Total_Weight,SUM(Total_Error) as Total_Error from LR_plan group by ID,Dosing_Id,Plan_Id, Real_Num,Total_Weight,Total_Error ) p on t.Plan_Id=p.Plan_Id WHERE 1=1"); List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 - //开始时间条件 - this._startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; - this._starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; - if (_startdate != null && _starttime != null) - { - sb.AppendLine(@"And cast(t.Start_Date as datetime) >='" + Convert.ToDateTime(_startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_starttime.MCValue).ToShortTimeString() + "' "); - } - else - { - ICSharpCode.Core.LoggingService.Debug("{生产报表} 缺少key值为startdate或者starttime的时间查询条件..."); - return; - } - this._enddate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "enddate").FirstOrDefault().BaseControl; - this._endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; - if (_enddate != null && _endtime != null) - { - sb.AppendLine(@" And cast(t.End_Date as datetime) <='" + Convert.ToDateTime(_enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_endtime.MCValue).ToShortTimeString() + "' "); - } - else - { - ICSharpCode.Core.LoggingService.Debug("{生产报表} 缺少key值为enddate或者enddate的时间查询条件..."); - return; - } + ////开始时间条件 + //this._startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; + //this._starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; + //if (_startdate != null && _starttime != null) + //{ + // sb.AppendLine(@"And cast(t.Start_Date as datetime) >='" + Convert.ToDateTime(_startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_starttime.MCValue).ToShortTimeString() + "' "); + //} + //else + //{ + // ICSharpCode.Core.LoggingService.Debug("{生产报表} 缺少key值为startdate或者starttime的时间查询条件..."); + // return; + //} + //this._enddate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "enddate").FirstOrDefault().BaseControl; + //this._endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; + //if (_enddate != null && _endtime != null) + //{ + // sb.AppendLine(@" And cast(t.End_Date as datetime) <='" + Convert.ToDateTime(_enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_endtime.MCValue).ToShortTimeString() + "' "); + //} + //else + //{ + // ICSharpCode.Core.LoggingService.Debug("{生产报表} 缺少key值为enddate或者enddate的时间查询条件..."); + // return; + //} this._recipeName = (base.GetControlById("comRecipe") as System.Windows.Forms.ComboBox).Text; if (!String.IsNullOrEmpty(this._recipeName)) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/Export.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/Export.cs index cdaaee3..dc58186 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/Export.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/Export.cs @@ -76,6 +76,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionYzReport //读取数据 foreach (DataRow item in dt.Rows) { + worksheet.Cells[row, 1].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 2].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 3].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 4].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 1] = item[0]; worksheet.Cells[row, 2] = item[1]; worksheet.Cells[row, 3] = item[2]; @@ -101,10 +106,19 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionYzReport int row = 2; foreach (DataRow item in dt1.Rows) { + worksheet.Cells[row, 1].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 2].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 3].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 4].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 5].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 6].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 7].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 8].EntireColumn.NumberFormat = "@"; + worksheet.Cells[row, 1] = item[4].ToString(); worksheet.Cells[row, 2] = item[5].ToString(); - worksheet.Cells[row, 3] = item[10].ToString(); - worksheet.Cells[row, 4]= item[11].ToString(); + worksheet.Cells[row, 3] = item[10].ToString(); + worksheet.Cells[row, 4] = item[11].ToString(); worksheet.Cells[row, 5] = item[9].ToString(); worksheet.Cells[row, 6] = item[2].ToString(); worksheet.Cells[row, 7] = item[7].ToString(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/InitFormAction.cs index fec4a52..dacc475 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/InitFormAction.cs @@ -1,4 +1,6 @@ using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.Entity.Report; +using Mesnac.Action.ChemicalWeighing.Report.ProductionReport; using Mesnac.Controls.Base; using System; using System.Collections.Generic; @@ -18,11 +20,28 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionYzReport base.RunIni(runtime); //必须要调用的 ICSharpCode.Core.LoggingService.Debug("生产报表-窗体初始化..."); - List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 - IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; - IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; - starttime.MCValue = DateTime.Parse("00:00:00"); - endtime.MCValue = DateTime.Parse("23:59:59"); + //List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 + //IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; + //IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; + //starttime.MCValue = DateTime.Parse("00:00:00"); + //endtime.MCValue = DateTime.Parse("23:59:59"); + + var comRecipe = base.GetControlById("comRecipe") as System.Windows.Forms.ComboBox;//配方名称 + if (comRecipe != null) + { + //List list = PlanHelper.GetRecipeMaterialListPY(); + IFreeSql _freeSql = DBHelper.FreeHelper.Instance; + string sql = "select distinct Material_BatchNumber from Hw_BinTypeErrorPreventionReport where Material_BatchNumber is not null"; + var list = _freeSql.Select().WithSql(sql).ToList(); + + comRecipe.DataSource = list; + comRecipe.DisplayMember = "Material_BatchNumber"; + comRecipe.ValueMember = "Material_BatchNumber"; + } } } + public class BinTypeError + { + public string Material_BatchNumber { get; set; } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/SelectAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/SelectAction.cs index a9c5924..4f9bbbc 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/SelectAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionYzReport/SelectAction.cs @@ -52,36 +52,37 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionYzReport sb.AppendLine(@" select * from Hw_BinTypeErrorPreventionReport WHERE 1=1"); List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 - //开始时间条件 - this._startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; - this._starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; - if (_startdate != null && _starttime != null) - { - sb.AppendLine(@"And CreateTime >='" + Convert.ToDateTime(_startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_starttime.MCValue).ToShortTimeString() + "' "); - } - else - { - ICSharpCode.Core.LoggingService.Debug("{料仓投料报表} 缺少key值为startdate或者starttime的时间查询条件..."); - return; - } - //结束时间条件 - this._enddate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "enddate").FirstOrDefault().BaseControl; - this._endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; - if (_enddate != null && _endtime != null) - { - sb.AppendLine(@" And CreateTime <='" + Convert.ToDateTime(_enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_endtime.MCValue).ToShortTimeString() + "' "); - } - else + ////开始时间条件 + //this._startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; + //this._starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; + //if (_startdate != null && _starttime != null) + //{ + // sb.AppendLine(@"And CreateTime >='" + Convert.ToDateTime(_startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_starttime.MCValue).ToShortTimeString() + "' "); + //} + //else + //{ + // ICSharpCode.Core.LoggingService.Debug("{料仓投料报表} 缺少key值为startdate或者starttime的时间查询条件..."); + // return; + //} + ////结束时间条件 + //this._enddate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "enddate").FirstOrDefault().BaseControl; + //this._endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; + //if (_enddate != null && _endtime != null) + //{ + // sb.AppendLine(@" And CreateTime <='" + Convert.ToDateTime(_enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_endtime.MCValue).ToShortTimeString() + "' "); + //} + //else + //{ + // ICSharpCode.Core.LoggingService.Debug("{料仓投料报表} 缺少key值为enddate或者enddate的时间查询条件..."); + // return; + //} + this._recipeName = (base.GetControlById("comRecipe") as System.Windows.Forms.ComboBox).Text; + + if (!String.IsNullOrEmpty(this._recipeName)) { - ICSharpCode.Core.LoggingService.Debug("{料仓投料报表} 缺少key值为enddate或者enddate的时间查询条件..."); - return; + sb.AppendLine($" and Material_BatchNumber like '%{_recipeName}%'"); } - this._recipeName = (base.GetControlById("MCTextBox1") as System.Windows.Forms.TextBox).Text; - if (_recipeName != "") - sb.AppendLine($" and (Material_InventoryCode like '%{_recipeName}%' or Material_BatchNumber like '%{_recipeName}%' or Material_SerialCode like '%{_recipeName}%')"); - - - dbHelper.CommandText = sb.ToString(); + dbHelper.CommandText = sb.ToString(); dbHelper.CommandType = System.Data.CommandType.Text; DataTable table = dbHelper.ToDataTable(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs index c4922fe..1ccdfb2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs @@ -27,17 +27,17 @@ namespace Mesnac.Action.ChemicalWeighing.Report.SolventReport //SelectRowAction.OnRefresh += Process_Event; List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 - IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; - IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; - starttime.MCValue = DateTime.Parse("00:00:00"); - endtime.MCValue = DateTime.Parse("23:59:59"); + //IBaseControl starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; + //IBaseControl endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; + //starttime.MCValue = DateTime.Parse("00:00:00"); + //endtime.MCValue = DateTime.Parse("23:59:59"); - var comShiftime = base.GetControlById("comShiftime") as System.Windows.Forms.ComboBox;//班组名称 - if (comShiftime != null) - { - List list = TechnicalHelper.GetPmt_ShiftimeList(); - comShiftime.DataSource = list; - } + //var comShiftime = base.GetControlById("comShiftime") as System.Windows.Forms.ComboBox;//班组名称 + //if (comShiftime != null) + //{ + // List list = TechnicalHelper.GetPmt_ShiftimeList(); + // comShiftime.DataSource = list; + //} var comRecipe = base.GetControlById("comRecipe") as System.Windows.Forms.ComboBox;//配方名称 if (comRecipe != null) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs index 3d6243f..fb3648f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs @@ -54,18 +54,18 @@ namespace Mesnac.Action.ChemicalWeighing.Report.SolventReport from xl_plan p left join xl_recipe r on p.Recipe_ID=r.ID Left Join Pmt_ShifTime B On(p.Shift_Id = B.Shift_ID) WHERE 1=1"); List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 - //开始时间条件 - this._startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; - this._starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; - if (_startdate != null && _starttime != null) - { - sb.AppendLine(@"And p.Start_Date >='" + Convert.ToDateTime(_startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_starttime.MCValue).ToShortTimeString() + "' "); - } - else - { - ICSharpCode.Core.LoggingService.Debug("{生产报表} 缺少key值为startdate或者starttime的时间查询条件..."); - return; - } + ////开始时间条件 + //this._startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; + //this._starttime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "starttime").FirstOrDefault().BaseControl; + //if (_startdate != null && _starttime != null) + //{ + // sb.AppendLine(@"And p.Start_Date >='" + Convert.ToDateTime(_startdate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_starttime.MCValue).ToShortTimeString() + "' "); + //} + //else + //{ + // ICSharpCode.Core.LoggingService.Debug("{生产报表} 缺少key值为startdate或者starttime的时间查询条件..."); + // return; + //} //结束时间条件 //this._enddate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "enddate").FirstOrDefault().BaseControl; //this._endtime = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "endtime").FirstOrDefault().BaseControl; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/RecipeHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/RecipeHelper.cs index 88789fb..4516824 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/RecipeHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/XlRecipe/RecipeHelper.cs @@ -773,7 +773,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.XlRecipe } dbHelper.ClearParameter(); dbHelper.CommandType = CommandType.Text; - string sqlstr = "select *, case Recipe_Verify when '1' then '是' else '否' end as 'RecipeVerify' from xl_recipe order by End_datetime desc"; + string sqlstr = "select *, case Recipe_Verify when '1' then '是' else '否' end as 'RecipeVerify' from xl_recipe order by CreateDateTime desc"; dbHelper.CommandText = sqlstr; DataTable dt = dbHelper.ToDataTable(); return dt; diff --git a/Main/MCEdit/Data/MCProject/nodeForm/小料料仓投料验证.xml b/Main/MCEdit/Data/MCProject/nodeForm/小料料仓投料验证.xml index d4f5608..e2dc17a 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/小料料仓投料验证.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/小料料仓投料验证.xml @@ -35,28 +35,30 @@ 11 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + True + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAMAAAAHAwAAAAABAAAABAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAANBAs= - - 0 - 0 True + Material_BatchNumber + ID + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + - False + True - None + Query True True - - 570, 14 - MCTextBox1 - 131, 21 - 9 + 12, 18 + comRecipe + 123, 20 + 46 @@ -77,7 +79,7 @@ Red DarkGray 导出 - 823, 12 + 279, 12 MCButton2 100, 30 6 @@ -101,128 +103,11 @@ Red DarkGray 查 询 - 723, 12 + 163, 12 MCButton1 100, 30 5 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - endtime - - False - - - - Query - True - True - Time - True - 483, 15 - MCDateTimePicker3 - 80, 21 - 4 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - enddate - - False - - - - Query - True - True - 353, 15 - MCDateTimePicker4 - 130, 21 - 3 - - - - - Red - DarkGray - OperationRecord_EndLable - - False - - - - None - True - True - MiddleCenter - 到 - 321, 18 - MCLabel2 - 17, 12 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - starttime - - False - - - - Query - True - True - HH:mm:ss - Time - True - 235, 15 - MCDateTimePicker2 - 80, 21 - 2 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - startdate - - False - - - - Query - True - True - 105, 15 - MCDateTimePicker1 - 130, 21 - 1 - - - - - Red - DarkGray - OperationRecord_StartLable - - False - - - - None - True - True - MiddleRight - 起止时间 - 18, 18 - MCLabel1 - 53, 12 - White Top 0, 0 @@ -230,7 +115,7 @@ 1054, 50 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDJiOTk5NWFiNzg4MTQxNTdkMDJkN2Y3MzQ0NGQ2YjFmBgYAAAAY5paZ5LuT5oqV5paZ55Sf5Lqn5oql6KGoBgcAAAAY5paZ5LuT5oqV5paZ55Sf5Lqn5oql6KGoCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCEdit/Data/MCProject/nodeForm/生产报表-小料.xml b/Main/MCEdit/Data/MCProject/nodeForm/生产报表-小料.xml index b061ef7..44bdf92 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/生产报表-小料.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/生产报表-小料.xml @@ -175,7 +175,7 @@ True 批次 宋体, 12pt - 692, 26 + 38, 34 MCLabel6 40, 16 @@ -201,90 +201,11 @@ Query True True - 770, 23 + 116, 31 comRecipe 123, 24 45 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - endtime - - False - - - - Query - True - True - Time - True - 561, 21 - MCDateTimePicker4 - 117, 26 - 14 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - starttime - - False - - - - Query - True - True - Time - True - 226, 21 - MCDateTimePicker3 - 117, 26 - 13 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - enddate - - False - - - - Query - True - True - Short - 451, 21 - MCDateTimePicker2 - 110, 26 - 12 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - startdate - - False - - - - Query - True - True - 宋体, 12pt - Short - 116, 21 - MCDateTimePicker1 - 110, 26 - 11 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQwQUE3RkYzNUFEQTQwNEY4Q0RCQTg3ODZEOTExODFEBgYAAAAS5a+85Ye655Sf5Lqn5oql6KGoBgcAAAAS5a+85Ye655Sf5Lqn5oql6KGoCw== @@ -304,7 +225,7 @@ Red DarkGray 导出报表 - 1075, 17 + 421, 25 MCButton2 125, 34 6 @@ -328,51 +249,11 @@ Red DarkGray 查询 - 928, 17 + 274, 25 MCButton3 125, 34 6 - - - - Red - DarkGray - - - False - - - - None - True - True - 结束时间 - 宋体, 12pt, style=Bold - 373, 26 - MCLabel2 - 76, 16 - - - - - Red - DarkGray - - - False - - - - None - True - True - 开始时间 - 宋体, 12pt, style=Bold - 38, 26 - MCLabel1 - 76, 16 - False 查询条件 Top