diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs index b6e280d..5b8eae1 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmPlanning.Designer.cs @@ -310,6 +310,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.groupBox3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); + } #endregion diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs index 123e9eb..e3c8641 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs @@ -78,7 +78,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning txtCpVersion.Text = main.FormulaVersion; } - var detail = LjFormulaDb.GetDetail(1); + var detail = LjFormulaDb.GetDetail(_id); UpdateDataGridDryer(detail); UpdateDataGridSilo(detail,main.CbSiloC); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/SelectAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/SelectAction.cs index 4c75683..c86cb9a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/SelectAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/SelectAction.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Windows.Forms; using DevExpress.Data.Extensions; +using DevExpress.PivotGrid.Criteria; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.LjPlanning.Db; @@ -31,13 +32,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjRecipeData { DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView; + + var s= this._runtime.IsReturn; //验证是否选中某物料 if (clientGridView.SelectedRows.Count != 1) { - MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, - MessageBoxButtons.OK, MessageBoxIcon.Information); - this._runtime.IsReturn = true; + //MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, + // MessageBoxButtons.OK, MessageBoxIcon.Information); + //this._runtime.IsReturn = true; return; }