diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs index 739c743..24a0981 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs @@ -2551,9 +2551,10 @@ namespace Mesnac.Action.ChemicalWeighing.ChemicalWeighingPlc if (f != null) { SiemensS7Net plc = PlcConnect.Instance; + int total_Weight = Convert.ToInt16(f.Total_Weight * 10); plc.Write("DB111.DBW20", short.Parse(f.Plan_Serial.ToString())); plc.Write("DB111.DBW22", short.Parse(f.Plan_Num.ToString())); - plc.Write("DB111.DBW24", short.Parse((f.Total_Weight * 10).ToString())); + plc.Write("DB111.DBW24", short.Parse(total_Weight.ToString())); plc.Write("DB111.DBW26", short.Parse("1")); //BasePlcHelper.Instance.PlcWriteByDataKey(BasePlcHelper.Instance.solvent_RecipeNo, new object[] { f.Plan_Serial });//配方编码 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/PlanHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/PlanHelper.cs index 4e8237d..35cda82 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/PlanHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/PlanHelper.cs @@ -3078,7 +3078,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.PptPlan dbHelper.CommandType = CommandType.Text; string strSql = @"select w.Weight_Id MID,p.Plan_Id,p.Plan_Num,p.Real_Num,p.Plan_Serial,p.Plan_State,p.Plan_Date,p.Plan_StateText,r.ID as RecipeID,r.Recipe_Serial,r.Recipe_Name,r.Version,r.Recipe_Verify,r.Total_Weight,r.Total_Error, m.ID as MaterialID,m.Material_name,w.Set_Weight,w.Set_Error,p.Exec_Num,w.TheoryRate - from (select * from RT_plan where Start_Date=(select Max(Start_Date) from RT_plan)) p left join Pmt_recipe r on p.Recipe_ID=r.ID left join Pmt_weigh w on r.ID=w.Recipe_ID + from (select * from RT_plan where Start_Date=(select Max(Start_Date) from RT_plan where Weighbridge='1号地磅')) p left join Pmt_recipe r on p.Recipe_ID=r.ID left join Pmt_weigh w on r.ID=w.Recipe_ID left join Pmt_material m on w.Material_ID=m.ID where p.Weighbridge='1号地磅' ORDER BY w.Weight_Id"; @@ -3107,7 +3107,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.PptPlan dbHelper.CommandType = CommandType.Text; string strSql = @"select w.Weight_Id MID,p.Plan_Id,p.Plan_Num,p.Real_Num,p.Plan_Serial,p.Plan_State,p.Plan_Date,p.Plan_StateText,r.ID as RecipeID,r.Recipe_Serial,r.Recipe_Name,r.Version,r.Recipe_Verify,r.Total_Weight,r.Total_Error, m.ID as MaterialID,m.Material_name,w.Set_Weight,w.Set_Error,p.Exec_Num,w.TheoryRate - from (select * from RT_plan where Start_Date=(select Max(Start_Date) from RT_plan)) p left join Pmt_recipe r on p.Recipe_ID=r.ID left join Pmt_weigh w on r.ID=w.Recipe_ID + from (select * from RT_plan where Start_Date=(select Max(Start_Date) from RT_plan where Weighbridge='2号地磅' )) p left join Pmt_recipe r on p.Recipe_ID=r.ID left join Pmt_weigh w on r.ID=w.Recipe_ID left join Pmt_material m on w.Material_ID=m.ID where p.Weighbridge='2号地磅' ORDER BY w.Weight_Id"; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/InitFormAction.cs index 0c64b5d..4de6479 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/InitFormAction.cs @@ -1,4 +1,5 @@ using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.Report.SolventReport; using Mesnac.Controls.Base; using System; using System.Collections.Generic; @@ -18,11 +19,24 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionSolventReport 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 Batch from RT_plan where Batch is not null"; + var list = _freeSql.Select().WithSql(sql).ToList(); + + comRecipe.DataSource = list; + comRecipe.DisplayMember = "Batch"; + comRecipe.ValueMember = "Batch"; + } } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/SelectAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/SelectAction.cs index c205e9f..b611ff2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/SelectAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionSolventReport/SelectAction.cs @@ -51,41 +51,40 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionSolventReport StringBuilder sb = new StringBuilder(); sb.AppendLine(@" select * from Hw_SolventErrorPreventionReport 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 - { - ICSharpCode.Core.LoggingService.Debug("{整包溶剂报表} 缺少key值为enddate或者enddate的时间查询条件..."); - return; - } - this._recipeName = (base.GetControlById("MCTextBox1") as System.Windows.Forms.TextBox).Text; + //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 + //{ + // ICSharpCode.Core.LoggingService.Debug("{整包溶剂报表} 缺少key值为enddate或者enddate的时间查询条件..."); + // return; + //} + var comRecipe = base.GetControlById("comRecipe") as System.Windows.Forms.ComboBox; + this._recipeName = comRecipe.Text; if (_recipeName != "") - sb.AppendLine($" and (Material_InventoryCode like '%{_recipeName}%' or Material_BatchNumber like '%{_recipeName}%' or Material_SerialCode like '%{_recipeName}%')"); - + sb.AppendLine($" and Batch like '{this._recipeName}%'"); dbHelper.CommandText = sb.ToString(); dbHelper.CommandType = System.Data.CommandType.Text; DataTable table = dbHelper.ToDataTable(); - _dgvRtPlan.BaseControl.BindDataSource = null; _dgvRtPlan.BaseControl.BindDataSource = table; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs index c693af4..c9fb9b3 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/InitFormAction.cs @@ -28,10 +28,10 @@ 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) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs index f21b2c3..6707242 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/SolventReport/SelectPlanAction.cs @@ -57,35 +57,35 @@ namespace Mesnac.Action.ChemicalWeighing.Report.SolventReport from RT_plan p left join Pmt_recipe r on p.Recipe_ID=r.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; - if (_enddate != null && _endtime != null) - { - sb.AppendLine(@" And p.End_Date <='" + Convert.ToDateTime(_enddate.MCValue).ToString("yyyy-MM-dd") + " " + Convert.ToDateTime(_endtime.MCValue).ToShortTimeString() + "' "); - } - else - { - ICSharpCode.Core.LoggingService.Debug("{生产报表} 缺少key值为enddate或者enddate的时间查询条件..."); - 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 p.End_Date <='" + 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; //this._shiftName = (base.GetControlById("comShiftime") as System.Windows.Forms.ComboBox).Text; if (!String.IsNullOrEmpty(this._recipeName)) { - sb.AppendLine(@" And p.Batch ='" + _recipeName + "' or Plan_State=3 "); + sb.AppendLine(@" and p.Batch like '" + _recipeName + "%' "); } //if (!String.IsNullOrEmpty(this._shiftName)) //{ diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/InitFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/InitFormAction.cs index 31b0020..a66274c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/InitFormAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/InitFormAction.cs @@ -386,7 +386,6 @@ namespace Mesnac.Action.ChemicalWeighing.Show clientGridControl.BaseControl.BindDataSource = null; return; } - SiemensS7Net plc = PlcConnect.Instance; int status01 = plc.ReadInt16("DB111.DBW1770").Content; //int status01 = BasePlcHelper.Instance.solvent_status01.NowValue.ToInt(); @@ -430,12 +429,10 @@ namespace Mesnac.Action.ChemicalWeighing.Show { lblStateMessage.Text = "完成"; } - List materialList = PlanHelper.DataTableToList(table); if (materialList.Count == 0) { return; } - MetagePlan plan2 = null; - var matlCode = BasePlcHelper.Instance.solvent2_materialNo.NowValue.ToInt(); + var matlCode = BasePlcHelper.Instance.solvent_materialNo.NowValue.ToInt(); if (matlCode == 0) { plan2 = materialList.FirstOrDefault(d => d.MID == 1); @@ -449,39 +446,44 @@ namespace Mesnac.Action.ChemicalWeighing.Show { return; } - if (!string.IsNullOrEmpty(planFlag)) + + var matSerial = plan2.MID; + + MetagePlan plan = materialList.FirstOrDefault(d => d.MID == matSerial); + if (plan2 != null) { lblPlanStateMessage.Text = plan2.Plan_StateText; } + + if (!string.IsNullOrEmpty(planFlag2)) { - if (planFlag == plan2.Plan_Id) + if (planFlag2 == plan.Plan_Id) { return; } else { - planFlag = plan2.Plan_Id; + planFlag2 = plan.Plan_Id; } } else { - planFlag = plan2.Plan_Id; + planFlag2 = plan.Plan_Id; } - if (plan2 != null) + + + if (plan != null) { + lblPlanStateMessage.Text = plan2.Plan_StateText; var p = materialList.FirstOrDefault(); lblPlanName.Text = p.Plan_Id; lblRecipeName.Text = p.Recipe_Name; - lblMaterial.Text = plan2.Material_name;//正在执行的物料号 - lblStandardWeight.Text = plan2.Total_Weight.ToString("f2"); - - rate.Text = plan2.TheoryRate.ToString(); + lblMaterial.Text = plan.Material_name;//正在执行的物料号 + lblStandardWeight.Text = plan.Total_Weight.ToString("f2"); + rate.Text = plan.TheoryRate.ToString(); } else { return; } - - - lock (String.Empty) { //本地计划 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/RecipeHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/RecipeHelper.cs index b89594f..44ca2fe 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/RecipeHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/RecipeHelper.cs @@ -775,7 +775,7 @@ namespace Mesnac.Action.ChemicalWeighing.Technical.PmtRecipe } dbHelper.ClearParameter(); dbHelper.CommandType = CommandType.Text; - string sqlstr = "select *, case Recipe_Verify when '1' then '是' else '否' end as 'RecipeVerify' from Pmt_recipe order by End_datetime desc"; + string sqlstr = "select *, case Recipe_Verify when '1' then '是' else '否' end as 'RecipeVerify' from Pmt_recipe order by CreateDateTime desc"; dbHelper.CommandText = sqlstr; DataTable dt = dbHelper.ToDataTable(); return dt; diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmProductionReport.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmProductionReport.xml index 75119e9..465e527 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FrmProductionReport.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmProductionReport.xml @@ -157,7 +157,7 @@ True 批次 宋体, 12pt - 685, 30 + 25, 32 MCLabel6 40, 16 @@ -183,90 +183,11 @@ Query True True - 763, 27 + 71, 29 comRecipe - 123, 24 + 172, 24 48 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - endtime - - False - - - - Query - True - True - Time - True - 550, 23 - 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 - 440, 23 - MCDateTimePicker2 - 110, 26 - 12 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - startdate - - False - - - - Query - True - True - 宋体, 12pt - Short - 116, 21 - MCDateTimePicker1 - 110, 26 - 11 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAQAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEJFNURFRkFBMUI2RDkxNTBDNDg3NTRBRjk1RjVGMTI1BgYAAAAS5a+85Ye655Sf5Lqn5oql6KGoBgcAAAAS5a+85Ye655Sf5Lqn5oql6KGoCw== @@ -286,7 +207,7 @@ Red DarkGray 导出报表 - 996, 23 + 336, 25 MCButton2 113, 30 6 @@ -310,51 +231,11 @@ Red DarkGray 查询 - 909, 23 + 249, 25 MCButton3 - 63, 30 + 81, 30 6 - - - - Red - DarkGray - - - False - - - - None - True - True - 结束时间 - 宋体, 12pt, style=Bold - 362, 28 - MCLabel2 - 76, 16 - - - - - Red - DarkGray - - - False - - - - None - True - True - 开始时间 - 宋体, 12pt, style=Bold - 38, 26 - MCLabel1 - 76, 16 - False 查询条件 Top diff --git a/Main/MCEdit/Data/MCProject/nodeForm/溶剂和整包投料历史报表.xml b/Main/MCEdit/Data/MCProject/nodeForm/溶剂和整包投料历史报表.xml index b713717..324ab1f 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/溶剂和整包投料历史报表.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/溶剂和整包投料历史报表.xml @@ -35,28 +35,32 @@ 11 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + True + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAMAAAAHAwAAAAABAAAABAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAANBAs= - - 0 - 0 True + Recipe_Name + ID + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + - False + True - - None + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L + + Query True True - - 595, 14 - MCTextBox1 - 130, 21 - 9 + 12, 14 + comRecipe + 172, 20 + 49 @@ -77,7 +81,7 @@ Red DarkGray 导出 - 856, 12 + 296, 7 MCButton2 100, 30 6 @@ -101,128 +105,11 @@ Red DarkGray 查 询 - 750, 11 + 190, 8 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 +117,7 @@ 1148, 50 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDJiOTk5NWFiNzg4MTQxNTdkMDJkN2Y3MzQ0NGQ2YjFmBgYAAAAY5paZ5LuT5oqV5paZ55Sf5Lqn5oql6KGoBgcAAAAY5paZ5LuT5oqV5paZ55Sf5Lqn5oql6KGoCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL