Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-11-08 a1fe0840ce2022ca711994ba10ba3512ae3c43be

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/01-series/PipeLineTreeListCtrl.cs

@@ -18,19 +18,19 @@
        //聚焦改变事件
        public event Action<long> ReloadEvent = null;

        private BLL.ThreeLinkSeries _bll = null;
        private BLL.AssetsThreelinkSeries _bll = null;

        private List<ThreeLinkSeriesViewModel> _allBindingList = new List<ThreeLinkSeriesViewModel>();
        private List<AssetsThreelinkSeriesViewModel> _allBindingList = new List<AssetsThreelinkSeriesViewModel>();

        public async void SetBindingData()
        {
            _bll = new BLL.ThreeLinkSeries();
            _bll = new BLL.AssetsThreelinkSeries();
            var alllist = await _bll.GetAll();
            if (alllist != null)
            {
                foreach (var item in alllist)
                {
                    _allBindingList.Add(new ThreeLinkSeriesViewModel(item));
                    _allBindingList.Add(new AssetsThreelinkSeriesViewModel(item));
                }
            }
            this.treeList1.DataSource = _allBindingList;
@@ -38,7 +38,7 @@
        }

        //获取系列ID
        public ThreeLinkSeriesViewModel GetCurrentSeries()
        public AssetsThreelinkSeriesViewModel GetCurrentSeries()
        {
            var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
            if (vm == null)
@@ -49,15 +49,15 @@
        //添加阀门系列
        private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AddThreeLinkSeriesDlg();
            var dlg = new AddAssetsThreelinkSeriesDlg();
            dlg.ReloadDataEvent += async (rhs) =>
            {
                var bll = new BLL.ThreeLinkSeries();
                var bll = new BLL.AssetsThreelinkSeries();
                var id = await bll.Insert(rhs);
                if (id > 0)
                {
                    rhs.ID = id;
                    _allBindingList.Add(new ThreeLinkSeriesViewModel(rhs));
                    _allBindingList.Add(new AssetsThreelinkSeriesViewModel(rhs));
                    this.treeList1.RefreshDataSource();
                    return true;
                }
@@ -72,7 +72,6 @@
            var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
            if (vm == null)
            {
                MessageBoxHelper.ShowWarning("请选择数据行!");
                return;
            }
            ReloadEvent.Invoke(vm.ID);
@@ -87,14 +86,14 @@
                MessageBoxHelper.ShowWarning("请选择数据行!");
                return;
            }
            var dlg = new EditThreeLinkSeriesDlg();
            var ThreeLinkSeries = await BLLFactory<BLL.ThreeLinkSeries>.Instance.GetByID(vm.ID);
            if (ThreeLinkSeries == null)
            var dlg = new EditAssetsThreelinkSeriesDlg();
            var AssetsThreelinkSeries = await BLLFactory<BLL.AssetsThreelinkSeries>.Instance.GetByID(vm.ID);
            if (AssetsThreelinkSeries == null)
                return;
            dlg.SetBindingData(ThreeLinkSeries);
            dlg.SetBindingData(AssetsThreelinkSeries);
            dlg.ReloadDataEvent += async (rhs) =>
            {
                if (await BLLFactory<BLL.ThreeLinkSeries>.Instance.Update(rhs))
                if (await BLLFactory<BLL.AssetsThreelinkSeries>.Instance.Update(rhs))
                {
                    vm.Reset(rhs);
                    this.treeList1.RefreshDataSource();