数据库添加状态

tangxu

2024-06-12 16ad5cbeb4ef90fcce13458e13acc324d592106c

 WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcResult.cs

@@ -7,8 +7,7 @@
using DevExpress.XtraBars.Docking2010;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using IStation.CalcModel;
using IStation.Model;
using IStation.CalcModel; 
using IStation.WinFrmUI.CalcErQu.Wizard;

namespace IStation.WinFrmUI.CalcErQu
@@ -343,7 +342,7 @@
        /// <summary>
        /// 计算最优
        /// </summary> 
        public void AnaOptResult(IStation.CalcModel.AnaRequest anaRequest, bool isTemp,Action<bool> finish_cb)
        public void AnaOptResult(IStation.CalcModel.AnaRequest anaRequest, bool isUsePredictRecord, bool isTemp,Action<bool> finish_cb)
        {
            this._anaRequest = anaRequest;
            if (anaRequest == null)
@@ -363,12 +362,12 @@
            string error_info = null;
            if (!IStation.BLL.ServiceParas.IsRemote)
            {
                var calcHelper = new IStation.CalcPrjHelper(); 
                var calcHelper = new IStation.CalcPrjHelper();
                error_info = calcHelper.Calc(anaRequest, out defaultPrj);
            }
            else
            {
                defaultPrj = IStation.BLL.AnaPrj.CalcPrj(anaRequest, isTemp);
                defaultPrj = IStation.BLL.AnaPrj.CalcPrj(anaRequest, isUsePredictRecord, isTemp);
            }


@@ -408,7 +407,7 @@
            //anaPrj.SumFlow = Math.Round(anaPrj.SumFlow, 0);
            //anaPrj.SumPower = Math.Round(anaPrj.SumPower, 0);

            var yester1_day_anaPrj = IStation.BLL.AnaPrj.GetPrj(current_prj.StartTime.AddDays(-1));
            var yester1_day_anaPrj = IStation.BLL.AnaPrj.GetDefaultPrjByStartDay(current_prj.StartTime.AddDays(-1));
            //var yester2_day_anaPrj = HistoryAnaPrjFileHelper.GetAnaPrj(current_prj.StartTime.AddDays(-2));

            this.anaResultInfoDefaultCtrl.SetBindingData(current_prj, yester1_day_anaPrj);