tx
2025-04-10 2538101febc78f525945da72c7cdcb2589f9e6ea
TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/²âÊÔ¹ÜÀí_±Ã³§/AddTest±Ã³§Dlg.cs
@@ -95,14 +95,14 @@
            this.selPumpSeriesCtrl.SetBindingData(  SeriesID);
            if (ProductID > 0 && SeriesID>0)
            this.selPumpSeriesCtrl.SetBindingData(SeriesID);
            if (ProductID > 0 && SeriesID > 0)
            {
                var series = _allSeries.Find(x=>x.ID == SeriesID);
                var series = _allSeries.Find(x => x.ID == SeriesID);
                if (series != null)
                {
                    this.selectProductCtrl.SetBindingData4Series(series, ProductID);
                }
                }
            }
            this.imageComboTestStandard.Properties.Items.Clear();
@@ -128,10 +128,17 @@
                return;
            }
            if (SelProductPump == null)
            if (checkEdit任意产品.Checked)
            {
                XtraMessageBox.Show("请选择测试型号!");
                return;
            }
            else
            {
                if (SelProductPump == null)
                {
                    XtraMessageBox.Show("请选择测试型号!");
                    return;
                }
            }
            if (imageComboTestStandard.SelectedIndex < 0)
@@ -167,9 +174,9 @@
                ProductType = TProduct.Model.eProductType.Pump,
                CreateTime = DateTime.Now,
                CreateUserID = user_id,
                SeriesID = this.SelProductSeries.ID,
                ProductID = this.SelProductPump.ID,
                PartID = this._selPart.ID,
                SeriesID = this.SelProductSeries == null ? 0 : this.SelProductSeries.ID,
                ProductID = this.SelProductPump == null ? 0 : this.SelProductPump.ID,
                PartID = this._selPart == null ? 0 : this._selPart.ID,
                IsFixed = false,
                UseStatus = TProduct.Model.eUseStatus.Enable,
                Name = textEditName.Text,
@@ -603,7 +610,7 @@
            if (_isAddPart)
            if (_isAddPart && SelProductPump != null)
            {
                _selPart = new TProduct.Model.PartBase();
                if (string.IsNullOrEmpty(this.TextEditPartCode.Text))
@@ -635,24 +642,28 @@
            else
            {
                //如果有一个属性改变则修改
                if (!String.Equals(this.TextEditPartName.Text, _selPart.Name) ||
                    !String.Equals(this.TextEditPartCode.Text, _selPart.Code) ||
                    !String.Equals(this.MemoEditNote.Text, _selPart.Note) ||
                    !String.Equals(manufactureTime, _selPart.ManufactureTime) ||
                    !String.Equals(sendTime, _selPart.SendTime) ||
                    selManufacture.ID != _selPart.ManufacturerID ||
                    selSender.ID != _selPart.SenderID)
                if(_selPart != null)
                {
                    _selPart.Code = this.TextEditPartCode.Text.Trim();
                    _selPart.Name = this.TextEditPartName.Text.Trim();
                    _selPart.ManufacturerID = selManufacture.ID;
                    _selPart.SenderID = selSender.ID;
                    _selPart.Note = this.MemoEditNote.Text.Trim();
                    _selPart.ManufactureTime = manufactureTime;
                    _selPart.SendTime = sendTime;
                    var bll = new BLL.PartBase();
                    return bll.Update(_selPart);
                    if (!String.Equals(this.TextEditPartName.Text, _selPart.Name) ||
                        !String.Equals(this.TextEditPartCode.Text, _selPart.Code) ||
                        !String.Equals(this.MemoEditNote.Text, _selPart.Note) ||
                        !String.Equals(manufactureTime, _selPart.ManufactureTime) ||
                        !String.Equals(sendTime, _selPart.SendTime) ||
                        selManufacture.ID != _selPart.ManufacturerID ||
                        selSender.ID != _selPart.SenderID)
                    {
                        _selPart.Code = this.TextEditPartCode.Text.Trim();
                        _selPart.Name = this.TextEditPartName.Text.Trim();
                        _selPart.ManufacturerID = selManufacture.ID;
                        _selPart.SenderID = selSender.ID;
                        _selPart.Note = this.MemoEditNote.Text.Trim();
                        _selPart.ManufactureTime = manufactureTime;
                        _selPart.SendTime = sendTime;
                        var bll = new BLL.PartBase();
                        return bll.Update(_selPart);
                    }
                }
            }
            return true;
@@ -682,5 +693,21 @@
        {
            SearchLookUpEditPressMeter.Enabled = !checkEdit根据测点设置出口压力.Checked;
        }
        private void checkEdit任意产品_CheckedChanged(object sender, EventArgs e)
        {
            if (checkEdit任意产品.Checked)
            {
                selPumpSeriesCtrl.Enabled = false;
                selectProductCtrl.Enabled = false;
                imageComboPart.Enabled = false;
            }
            else
            {
                selPumpSeriesCtrl.Enabled = true;
                selectProductCtrl.Enabled = true;
                imageComboPart.Enabled = true;
            }
        }
    }
}