From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
index 865b3eb..5484a2e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
@@ -1,4 +1,5 @@
锘縰sing HStation.WinFrmUI.Xhs.PumpProduct;
+using NetTaste;
namespace HStation.WinFrmUI
{
@@ -9,6 +10,7 @@
InitializeComponent();
this.gridView1.Columns["PropGroupName"].Group();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
+ this.pumpProductListBox1.MouseUp += PumpProductListBox1_MouseUp;
}
private BLL.AssetsPumpPartMain _bll = null;
@@ -117,10 +119,9 @@
updatepart.Code = TextEditProductCode.Text;
updatepart.SeriesID = _seriesID;
var updateproplist = new List<UpdateAssetsPumpPropContentInput>();
- // var update = _allPropList.Select(x => x.Adapt<AssetsPumpPropContentDto, UpdateAssetsPumpPropContentInput>()).ToList();
foreach (var item in _proplist)
{
- if (_allPropList != null)
+ if (_allPropList != null || _allBindingList.Count > 0)
{
_allPropList.Find(x => x.PropID == item.ID).PropValue = item.Value;
}
@@ -138,7 +139,7 @@
}
//宸︿晶鏍戝彸鍑昏彍鍗曚簨浠�
- private void ListBoxPart_MouseUp(object sender, MouseEventArgs e)
+ private void PumpProductListBox1_MouseUp(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
{
--
Gitblit v1.9.3