大改

tx

8 天以前 e0b138b3e057de6f57021e6c8963868f5c5acc5a

 TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/MainPageÐÔÄܲâÊÔ/FeatTestIngMainPage_Setting.cs

@@ -262,13 +262,13 @@
                    {//  æš‚时用不到, éƒ½æ˜¯ä»Žæµ‹ç‚¹æˆ–者泵上获取的,代码暂时保留
                        if (monitor_outletPress.AnalogParas == null)
                            monitor_outletPress.AnalogParas = new Model.AnalogMonitorPointParas();
                        monitor_outletPress.PipeDia = instrumentInfo.OutletPressureMeterPipeDia;
                      //  monitor_outletPress.PipeDia = instrumentInfo.OutletPressureMeterPipeDia;
                    }
                    if (instrumentInfo.InletPressureMeterElevation > 0)
                    {
                        if (monitor_outletPress.AnalogParas == null)
                            monitor_outletPress.AnalogParas = new Model.AnalogMonitorPointParas();
                        monitor_outletPress.Elevation = instrumentInfo.OutletPressureMeterElevation;
                       // monitor_outletPress.Elevation = instrumentInfo.OutletPressureMeterElevation;
                    }

                    //1:来源泵口径
@@ -278,7 +278,7 @@
                        {
                            if (monitor_outletPress.AnalogParas == null)
                                monitor_outletPress.AnalogParas = new Model.AnalogMonitorPointParas();
                            monitor_outletPress.PipeDia = this._ratedParas.OutletDia.Value;
                           // monitor_outletPress.PipeDia = this._ratedParas.OutletDia.Value;
                        }
                    }
                }
@@ -308,13 +308,13 @@
                    {
                        if (monitor_inletPress.AnalogParas == null)
                            monitor_inletPress.AnalogParas = new Model.AnalogMonitorPointParas();
                        monitor_inletPress.PipeDia = instrumentInfo.InletPressureMeterPipeDia;
                      //  monitor_inletPress.PipeDia = instrumentInfo.InletPressureMeterPipeDia;
                    }
                    if (instrumentInfo.InletPressureMeterElevation > 0)
                    {
                        if (monitor_inletPress.AnalogParas == null)
                            monitor_inletPress.AnalogParas = new Model.AnalogMonitorPointParas();
                        monitor_inletPress.Elevation = instrumentInfo.InletPressureMeterElevation;
                       // monitor_inletPress.Elevation = instrumentInfo.InletPressureMeterElevation;
                    }
                    //1:来源泵口径
                    if (TProduct.UserSetting.Setting.PumpTest.InletPressMonitorDiaStatus == 1 && _ratedParas != null)
@@ -323,7 +323,7 @@
                        {
                            if (monitor_inletPress.AnalogParas == null)
                                monitor_inletPress.AnalogParas = new Model.AnalogMonitorPointParas();
                            monitor_inletPress.PipeDia = this._ratedParas.InletDia.Value;
                           // monitor_inletPress.PipeDia = this._ratedParas.InletDia.Value;
                        }
                    }
                }
@@ -366,7 +366,7 @@
                        DigitalParas = null,
                        DispInPanel = 1,
                        AnalogParas = null,
                        BenchID = this._workBenchInfo.ID,
                        //BenchID = this._workBenchInfo.ID,

                        CreateTime = DateTime.Now,
                        CreateUserID = TProduct.WinFrmUI.GlobeParas.CurrentLoginUser.ID,
@@ -394,7 +394,7 @@
                        DigitalParas = null,
                        DispInPanel = 1,
                        AnalogParas = null,
                        BenchID = this._workBenchInfo.ID,
                        //BenchID = this._workBenchInfo.ID,

                        CreateTime = DateTime.Now,
                        CreateUserID = TProduct.WinFrmUI.GlobeParas.CurrentLoginUser.ID,
@@ -426,7 +426,7 @@
                            DigitalParas = null,
                            DispInPanel = 1,
                            AnalogParas = null,
                            BenchID = this._workBenchInfo.ID,
                            //BenchID = this._workBenchInfo.ID,

                            CreateTime = DateTime.Now,
                            CreateUserID = TProduct.WinFrmUI.GlobeParas.CurrentLoginUser.ID,