From d4898c5d7e1bbbbba384a0e29f29c066d6f502a7 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 25 十一月 2024 17:44:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs
index 2830db1..5e22568 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/04-pipe/01-pipesinglematching/PipeSingleMatchingForm.cs
@@ -1,21 +1,22 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縩amespace HStation.WinFrmUI
{
public partial class PipeSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
{
public PipeSingleMatchingForm()
{
InitializeComponent();
+ this.gridView3.SetNormalView();
}
private PipeMatchingViewModel _pipeMatchingViewModel;
- private BLL.PipeMain _PipeLineBll;
+ private BLL.AssetsPipeMain _PipeLineBll;
private List<PipeSingleMatchingViewModel> _allBindingList;
public async void SetBindingData(PipeMatchingViewModel PipeMatchingViewModel)
{
_pipeMatchingViewModel = PipeMatchingViewModel;
_allBindingList = new List<PipeSingleMatchingViewModel>();
- _PipeLineBll = new BLL.PipeMain();
+ _PipeLineBll = new BLL.AssetsPipeMain();
var allPipeLineMain = await _PipeLineBll.GetAll();
foreach (var Main in allPipeLineMain)
{
--
Gitblit v1.9.3