From 3720316038d2d2e283d9ef3c4385b76c2b4ada34 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 17 二月 2025 15:29:45 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs
index 6afae67..871d27b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs
@@ -1,13 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+锘縰sing System.Data;
namespace HStation.WinFrmUI
{
@@ -33,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsPipeMain>.Instance.GetAll();
- _allList = new List<AssetsPipeSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsPipeSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsPipeSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsPipeSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
--
Gitblit v1.9.3