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

Shuxia Ning

2025-01-16 90865b0dbca3f3a872065bb202e321ca4d021058

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

 BLL/HStation.BLL.Assets.Core/02-httpclient/15-Tank/AssetsTankMain.cs

@@ -9,7 +9,7 @@
    {
        protected override string Prefix
        {
            get { return $"{HStation.BLL.Assets.ConfigHelper.HttpUrl}/AssetsTankMain"; }
            get { return $"{HStation.BLL.Assets.ConfigHelper.HttpUrl}/Assets/Tank/Main"; }
        }

        public Task<List<AssetsTankMainDto>> GetBySeriesID(long ID)

 BLL/HStation.BLL.Assets.Core/02-httpclient/15-Tank/AssetsTankSeries.cs

@@ -9,7 +9,7 @@
    {
        protected override string Prefix
        {
            get { return $"{HStation.BLL.Assets.ConfigHelper.HttpUrl}/AssetsTankSeries"; }
            get { return $"{HStation.BLL.Assets.ConfigHelper.HttpUrl}Assets/Tank/Series"; }
        }

        /// <summary>

 Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj

@@ -16,7 +16,7 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.5.3" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.5.6" />
  </ItemGroup>

  <ItemGroup>

 WinFrmUI/HStation.WinFrmUI.Auth.Core/01-menu/MenuMgrPage.cs

@@ -65,7 +65,7 @@
            dlg.SetBindingData(row != null ? row.ID : 0);
            dlg.ReloadDataEvent += async (rhs) =>
            {
                var id = await _bll.Insert(rhs.ProjectMenu);
                var id = await _bll.InsertEx(rhs);
                if (id > 0)
                {
                    rhs.ProjectMenu.ID = id;

 WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj

@@ -40,7 +40,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="17.5.0-beta.23060.1" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.5.3" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.5.5" />
  </ItemGroup>

  <ItemGroup>

 WinFrmUI/HStation.WinFrmUI.Basic.Core/00-core/Helper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,79 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yw;
using Yw.Basic;

namespace HStation.WinFrmUI
{
    public class SysTypeHelper
    {
        public static async Task<List<SysTypeTreeList>> GetSysTypeTreeList()
        {
            var allModule = await BLLFactory<Yw.BLL.SysModule>.Instance.GetAll();
            var allType = await BLLFactory<Yw.BLL.SysType>.Instance.GetAll();
            var sysTypeList = new List<SysTypeTreeList>();
            if (allModule != null)
            {
                foreach (var module in allModule)
                {
                    var model = new SysTypeTreeList();
                    model.Module = module;
                    model.Children = new List<Yw.Vmo.SysTypeVmo>();
                    if (allType != null)
                    {
                        foreach (var item in allType)
                        {
                            if (item.ModuleID == module.ID)
                            {
                         model.Children.Add(item);
                             }
                        }
                    }
                    sysTypeList.Add(model);
                }
            }
            return sysTypeList;
        }

        public static async Task<List<SysTypeTreeList>> GetSysTypeTreeListByExtendType(eExtendType eExtendType)
        {
            var allModule = await BLLFactory<Yw.BLL.SysModule>.Instance.GetAll();
            var allType = await BLLFactory<Yw.BLL.SysType>.Instance.GetAll();
            var sysTypeList = new List<SysTypeTreeList>();
            if (allModule != null)
            {
                foreach (var module in allModule)
                {
                    var model = new SysTypeTreeList();
                    model.Module = module;
                    model.Children = new List<Yw.Vmo.SysTypeVmo>();
                    if (allType != null)
                    {
                        foreach (var item in allType)
                        {
                            if (item.ModuleID == module.ID)
                            {
                                if (item.ExtendType == eExtendType)
                                {
                                    model.Children.Add(item);
                                }
                            }
                        }
                    }
                    sysTypeList.Add(model);
                }
            }
            return sysTypeList;
        }

        public class SysTypeTreeList
        {
            public Yw.Vmo.SysModuleVmo Module { get; set; }

            public List<Yw.Vmo.SysTypeVmo> Children { get; set; }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/00-ViewModel/SysTypeTreeListViewModel.cs

@@ -1,28 +1,27 @@
using Yw.Dto;
using static HStation.WinFrmUI.SysTypeHelper;

namespace HStation.WinFrmUI.Basic
{
    public class SysTypeTreeListViewModel
    {
        public SysTypeTreeListViewModel(Yw.Vmo.SysTypeLogicalTreeVmo rhs)
        public SysTypeTreeListViewModel(Yw.Vmo.SysModuleVmo rhs)
        {
            var Module = rhs.LogicalModel as SysModuleStdDto;
            this.ID = Module.ID;
            this.Name = Module.Name;
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.ImageIndex = ImageLib.Series;
            this.SortCode = Module.SortCode;
            this.Description = Module.Description;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
        }

        public SysTypeTreeListViewModel(Yw.Vmo.LogicalTreeExVmo rhs)
        public SysTypeTreeListViewModel(Yw.Vmo.SysTypeVmo rhs)
        {
            var systype = rhs.LogicalModel as SysTypeStdDto;
            this.ParentID = systype.ModuleID;
            this.ID = systype.ID;
            this.Name = systype.Name;
            this.ID = rhs.ID;
            this.ParentID = rhs.ModuleID;
            this.Name = rhs.Name;
            this.ImageIndex = ImageLib.Type;
            this.SortCode = systype.SortCode;
            this.Description = systype.Description;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
        }

        public void Reset(SysTypeLogicalTreeDto rhs)

 WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SetSysPropForCatalogDlg.cs

@@ -21,34 +21,37 @@
            _CatlogID = ID;
            _bll = new Yw.BLL.SysPropMapping();
            var PropTreeList = await _bll.GetHaveListByCatalogID(ID);
            foreach (var item in PropTreeList)
            if (PropTreeList != null)
            {
                repositoryItemCheckedComboBoxEdit1.Items.Clear();
                var parent = new SysPropMappingViewModel();
                parent.ID = item.ID;
                parent.IsGroup = true;
                parent.Name = item.Name;
                _allBindingList.Add(parent);
                if (item.PropList.Count > 0)
                foreach (var item in PropTreeList)
                {
                    foreach (var child in item.PropList)
                    repositoryItemCheckedComboBoxEdit1.Items.Clear();
                    var parent = new SysPropMappingViewModel();
                    parent.ID = item.ID;
                    parent.IsGroup = true;
                    parent.Name = item.Name;
                    _allBindingList.Add(parent);
                    if (item.PropList.Count > 0)
                    {
                        var model = new SysPropMappingViewModel();
                        model.GroupName = item.Name;
                        model.ID = child.ID;
                        model.ParentID = item.ID;
                        model.Name = child.Name;
                        model.IsHave = child.Have;
                        model.IsNull = child.IsNull;
                        model.DefaultValue = child.DefaultValue;
                        model.UnitName = child.UnitName;
                        model.Inherit = child.Inherit;
                        model.ChoiceList = child.ChoiceList;
                        model.ChoiceIds = child.ChoiceList.Where(x => x.Have).Select(x => x.ID).ToList();
                        var stringList = child.ChoiceList.Where(x => x.Have == true).ToList().Select(x => x.Name.ToString()).ToList();
                        string result = string.Join(", ", stringList);
                        model.DisplayChoice = result;
                        _allBindingList.Add(model);
                        foreach (var child in item.PropList)
                        {
                            var model = new SysPropMappingViewModel();
                            model.GroupName = item.Name;
                            model.ID = child.ID;
                            model.ParentID = item.ID;
                            model.Name = child.Name;
                            model.IsHave = child.Have;
                            model.IsNull = child.IsNull;
                            model.DefaultValue = child.DefaultValue;
                            model.UnitName = child.UnitName;
                            model.Inherit = child.Inherit;
                            model.ChoiceList = child.ChoiceList;
                            model.ChoiceIds = child.ChoiceList.Where(x => x.Have).Select(x => x.ID).ToList();
                            var stringList = child.ChoiceList.Where(x => x.Have == true).ToList().Select(x => x.Name.ToString()).ToList();
                            string result = string.Join(", ", stringList);
                            model.DisplayChoice = result;
                            _allBindingList.Add(model);
                        }
                    }
                }
            }

 WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysTypeListBoxCtrl.cs

@@ -1,5 +1,6 @@
using DevExpress.Utils;
using DevExpress.XtraEditors;
using Yw;
using Yw.Basic;

namespace HStation.WinFrmUI.Basic
@@ -23,8 +24,6 @@

        private List<SysTypeTreeListViewModel> _allBindingList = null;

        private Yw.BLL.SysTypeStd _bll = null;

        private Yw.BLL.SysModule _Modulebll = null;

        /// <summary>
@@ -41,12 +40,12 @@
        public async void SetBindingData()
        {
            _allBindingList = new List<SysTypeTreeListViewModel>();
            _bll = new Yw.BLL.SysTypeStd();
            var alllist = await _bll.GetLogicalTreeListByExtendType(eExtendType.Catalog);
            var alllist = await SysTypeHelper.GetSysTypeTreeListByExtendType(eExtendType.Catalog);
            //var alllist = await BLLFactory<Yw.BLL.SysType>.Instance.GetLogicalTreeListByExtendType(eExtendType.Catalog);
            if (alllist == null) return;
            foreach (var item in alllist)
            {
                var module = new SysTypeTreeListViewModel(item);
                var module = new SysTypeTreeListViewModel(item.Module);
                _allBindingList.Add(module);
                foreach (var child in item.Children)
                {

 WinFrmUI/HStation.WinFrmUI.Basic.Core/03-SysFlagManage/SysFlagTreeListCtrl.cs

@@ -1,5 +1,6 @@
using DevExpress.Utils;
using DevExpress.XtraEditors;
using Yw.Basic;

namespace HStation.WinFrmUI.Basic
{
@@ -22,7 +23,7 @@

        private List<SysTypeTreeListViewModel> _allBindingList = null;

        private Yw.BLL.SysTypeStd _bll = null;
        private Yw.BLL.SysType _bll = null;

        private Yw.BLL.SysModule _Modulebll = null;

@@ -40,12 +41,11 @@
        public async void SetBindingData()
        {
            _allBindingList = new List<SysTypeTreeListViewModel>();
            _bll = new Yw.BLL.SysTypeStd();
            var alllist = await _bll.GetLogicalTreeList();
            var alllist = await SysTypeHelper.GetSysTypeTreeList();
            if (alllist == null) return;
            foreach (var item in alllist)
            {
                var module = new SysTypeTreeListViewModel(item);
                var module = new SysTypeTreeListViewModel(item.Module);
                _allBindingList.Add(module);
                foreach (var child in item.Children)
                {

 WinFrmUI/HStation.WinFrmUI.Basic.Core/04-SysPropManage/SelectCorprationListCtrl.cs

@@ -1,5 +1,7 @@
using System.ComponentModel;
using HStation.WinFrmUI;
using System.ComponentModel;
using Yw.Dto;
using MessageBoxHelper = Yw.WinFrmUI.MessageBoxHelper;

namespace MFire.WinFrmUI
{
@@ -15,16 +17,15 @@

        public class CurrentViewModel
        {
            public CurrentViewModel(Yw.Vmo.SysTypeLogicalTreeVmo rhs)
            public CurrentViewModel(Yw.Vmo.SysModuleVmo rhs)
            {
                var module = rhs.LogicalModel as Yw.Dto.SysModuleStdDto;
                this.ID = module.ID;
                this.Name = module.Name;
                this.SortCode = module.SortCode;
                this.Description = module.Description;
                this.ID = rhs.ID;
                this.Name = rhs.Name;
                this.SortCode = rhs.SortCode;
                this.Description = rhs.Description;
            }

            public CurrentViewModel(SysTypeStdDto rhs)
            public CurrentViewModel(Yw.Vmo.SysTypeVmo rhs)
            {
                this.ID = rhs.ID;
                this.Name = rhs.Name;
@@ -59,8 +60,6 @@
            public string Description { get; set; }
        }

        private Yw.BLL.SysTypeStd _bll = null;

        /// <summary>
        /// é€‰æ‹©é¡¹å˜æ¢
        /// </summary>
@@ -73,21 +72,16 @@
        /// </summary>
        public async void SetBindingData()
        {
            _bll = new Yw.BLL.SysTypeStd();
            _allBindingList = new BindingList<CurrentViewModel>();
            var alllist = await _bll.GetExtendLogicalTreeList();
            var alllist = await SysTypeHelper.GetSysTypeTreeList();
            if (alllist == null)
                return;
            foreach (var item in alllist)
            {
                _allBindingList.Add(new CurrentViewModel(item));
                _allBindingList.Add(new CurrentViewModel(item.Module));
                foreach (var child in item.Children)
                {
                    var type = child.LogicalModel as Yw.Dto.SysTypeStdDto;
                    if (type != null)
                    {
                        _allBindingList.Add(new CurrentViewModel(type));
                    }
                    _allBindingList.Add(new CurrentViewModel(child));
                }
            }
            this.treeListLookUpEdit1TreeList.DataSource = _allBindingList;

 WinFrmUI/HStation.WinFrmUI.Basic.Core/04-SysPropManage/SysTypeTreeListLookUpEdit.cs

@@ -18,16 +18,15 @@

        public class CurrentViewModel
        {
            public CurrentViewModel(Yw.Vmo.SysTypeLogicalTreeVmo rhs)
            public CurrentViewModel(Yw.Vmo.SysModuleVmo rhs)
            {
                var module = rhs.LogicalModel as Yw.Dto.SysModuleStdDto;
                this.ID = module.ID;
                this.Name = module.Name;
                this.SortCode = module.SortCode;
                this.Description = module.Description;
                this.ID = rhs.ID;
                this.Name = rhs.Name;
                this.SortCode = rhs.SortCode;
                this.Description = rhs.Description;
            }

            public CurrentViewModel(SysTypeStdDto rhs)
            public CurrentViewModel(Yw.Vmo.SysTypeVmo rhs)
            {
                this.ID = rhs.ID;
                this.Name = rhs.Name;
@@ -62,8 +61,6 @@
            public string Description { get; set; }
        }

        private Yw.BLL.SysTypeStd _bll = null;

        /// <summary>
        /// é€‰æ‹©é¡¹å˜æ¢
        /// </summary>
@@ -76,21 +73,16 @@
        /// </summary>
        public async void SetBindingData()
        {
            _bll = new Yw.BLL.SysTypeStd();
            var alllist = await _bll.GetExtendLogicalTreeList();
            var alllist = await SysTypeHelper.GetSysTypeTreeListByExtendType(Yw.Basic.eExtendType.Catalog);
            if (alllist == null)
                return;
            _allBindingList = new BindingList<CurrentViewModel>();
            foreach (var item in alllist)
            {
                _allBindingList.Add(new CurrentViewModel(item));
                _allBindingList.Add(new CurrentViewModel(item.Module));
                foreach (var child in item.Children)
                {
                    var type = child.LogicalModel as Yw.Dto.SysTypeStdDto;
                    if (type != null)
                    {
                        _allBindingList.Add(new CurrentViewModel(type));
                    }
                    _allBindingList.Add(new CurrentViewModel(child));
                }
            }
            this.treeListLookUpEdit1TreeList.DataSource = _allBindingList;

 WinFrmUI/HStation.WinFrmUI.Basic.Core/04-SysPropManage/SysTypeTreeListLookUpEdit.resx

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema 
    Microsoft ResX Schema

    Version 2.0

@@ -48,7 +48,7 @@
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    

    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

 WinFrmUI/HStation.WinFrmUI.Basic.Core/HStation.WinFrmUI.Basic.Core.csproj

@@ -13,7 +13,7 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.3.0" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.3.2" />
  </ItemGroup>

  <ItemGroup>