冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs

@@ -130,7 +130,6 @@
            updatepart.NO = TextEditNo.Text;
            updatepart.Code = TextEditProductCode.Text;
            updatepart.SeriesID = _series.ID;
            var propList = _propList.Where(x => x.TagName == "Prop").ToList(); //找到所有的额外属性
            foreach (var item in _propList)
            {
                if (_allPropList != null)
@@ -177,10 +176,10 @@
            }
            var pumpMainBll = new BLL.AssetsPumpMain();
            await pumpMainBll.Update(_pumpMain);
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Flow"));
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Head"));
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Power"));
            _propList.Remove(_propList.Find(x => x.TagName == "Basic_Speed"));
            _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Flow"));
            _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Head"));
            _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Power"));
            _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Speed"));
            if (await _bll.UpdateEx(updatepart, _allPropList))
            {
                vm.Reset(updatepart);