冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AddAssetsTranslationFactorDlg.cs

@@ -31,9 +31,16 @@
            if (_last != null)
            {
                this.txtName.EditValue = _last.Name;
                this.txtMinorLoss.EditValue = _last.MinorLoss;
                this.TextEditMinorLoss.EditValue = _last.MinorLoss;
                this.textEditStartDiameter.EditValue = _last.StartDiameter;
                this.textEditEndDiameter.EditValue = _last.EndDiameter;
                this.txtCaliber.EditValue = _last.Diameter;
                this.textEditTranslationType.EditValue = _last.TranslationType;
                this.txtMaterial.EditValue = _last.Material;
                this.txtDescription.EditValue = _last.Description;
            }
            this.textEditTranslationType.Properties.AddEnum(typeof(HStation.Assets.eTranslationType));
            this.textEditTranslationType.SelectedIndex = 0;
        }

        //验证
@@ -45,9 +52,9 @@
                this.dxErrorProvider1.SetError(this.txtName, "必填项");
                return false;
            }
            if (string.IsNullOrEmpty(this.txtMinorLoss.Text.Trim()))
            if (string.IsNullOrEmpty(this.TextEditMinorLoss.Text.Trim()))
            {
                this.dxErrorProvider1.SetError(this.txtMinorLoss, "必填项");
                this.dxErrorProvider1.SetError(this.TextEditMinorLoss, "必填项");
                return false;
            }
            return true;
@@ -65,7 +72,12 @@
                return;
            }
            _vmo.Name = this.txtName.Text.Trim();
            _vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
            _vmo.MinorLoss = double.Parse(this.TextEditMinorLoss.EditValue?.ToString());
            _vmo.Material = this.txtMaterial.Text.Trim();
            _vmo.Diameter = double.Parse(this.txtCaliber.EditValue?.ToString());
            _vmo.StartDiameter = double.Parse(this.textEditStartDiameter.EditValue?.ToString());
            _vmo.EndDiameter = double.Parse(this.textEditEndDiameter.EditValue?.ToString());
            _vmo.TranslationType = (HStation.Assets.eTranslationType)this.textEditTranslationType.EditValue;
            _vmo.Description = this.txtDescription.Text.Trim();
            var id = await BLLFactory<HStation.BLL.AssetsTranslationFactor>.Instance.Insert(_vmo);
            if (id < 1)