修改成套设备增加逻辑

duheng

2025-03-28 e411302bca8857e102443a5250c82b9580ef07a3

修改成套设备增加逻辑

 BLL/HStation.BLL.Assets.Core/04-bll/13-Package/05-AssetsPackageMainAndPartMapping/AssetsPackageMainAndPartMapping.cs

 BLL/HStation.BLL.Assets.Core/04-bll/13-Package/05-AssetsPackageMainAndPartMapping/AssetsPackageMainAndPartMapping_Instance.cs

 BLL/HStation.BLL.Assets.Core/04-bll/13-Package/06-AssetsPackagePartMain/AssetsPackagePartMain.cs

 BLL/HStation.BLL.Assets.Core/04-bll/13-Package/06-AssetsPackagePartMain/AssetsPackagePartMain_Instance.cs

 BLL/HStation.BLL.Assets.Core/04-bll/13-Package/07-AssetsPackagePropContent/AssetsPackagePropContent.cs

 BLL/HStation.BLL.Assets.Core/04-bll/13-Package/07-AssetsPackagePropContent/AssetsPackagePropContent_Instance.cs

 BLL/PBS.BLL/04-bll/01-place/Place.cs

@@ -1,12 +1,12 @@
using Yw.BLL;

namespace PBS.BLL
{
    /// <summary>
    /// åœºæ‰€
    ///</summary>    
    ///</summary>
    public partial class Place
    {

        private readonly PBS.CAL.IPlace _cal = CALCreateHelper.CreateCAL<PBS.CAL.IPlace>();

        #region Query
@@ -14,7 +14,7 @@
        /// <summary>
        /// èŽ·å–所有
        /// </summary>
        public async virtual Task<List<PBS.Vmo.PlaceVmo>> GetAll()
        public virtual async Task<List<PBS.Vmo.PlaceVmo>> GetAll()
        {
            var dtoList = await _cal.GetAll();
            return Dto2Vmos(dtoList);
@@ -23,7 +23,7 @@
        /// <summary>
        /// é€šè¿‡ ID èŽ·å–
        /// </summary>
        public async virtual Task<PBS.Vmo.PlaceVmo> GetByID(long ID)
        public virtual async Task<PBS.Vmo.PlaceVmo> GetByID(long ID)
        {
            var dto = await _cal.GetByID(ID);
            return Dto2Vmo(dto);
@@ -32,20 +32,20 @@
        /// <summary>
        /// é€šè¿‡ Ids èŽ·å–
        /// </summary>
        public async virtual Task<List<PBS.Vmo.PlaceVmo>> GetByIds(List<long> Ids)
        public virtual async Task<List<PBS.Vmo.PlaceVmo>> GetByIds(List<long> Ids)
        {
            var dtoList = await _cal.GetByIds(Ids);
            return Dto2Vmos(dtoList);
        }

        #endregion
        #endregion Query

        #region Insert

        /// <summary>
        /// æ’入一条
        /// </summary>
        public async virtual Task<long> Insert(PBS.Vmo.PlaceVmo vmo)
        public virtual async Task<long> Insert(PBS.Vmo.PlaceVmo vmo)
        {
            var dto = Vmo2AddDto(vmo);
            var id = await _cal.Insert(dto);
@@ -55,21 +55,21 @@
        /// <summary>
        /// æ’入多条
        /// </summary>
        public async virtual Task<bool> Inserts(List<PBS.Vmo.PlaceVmo> vmoList)
        public virtual async Task<bool> Inserts(List<PBS.Vmo.PlaceVmo> vmoList)
        {
            var dtoList = Vmo2AddDtos(vmoList);
            var bol = await _cal.Inserts(dtoList);
            return bol;
        }

        #endregion
        #endregion Insert

        #region Update

        /// <summary>
        /// æ›´æ–°
        /// </summary>
        public async virtual Task<bool> Update(PBS.Vmo.PlaceVmo vmo)
        public virtual async Task<bool> Update(PBS.Vmo.PlaceVmo vmo)
        {
            var dto = Vmo2UpdateDto(vmo);
            var bol = await _cal.Update(dto);
@@ -79,18 +79,17 @@
        /// <summary>
        /// æ‰¹é‡æ›´æ–°
        /// </summary>
        public async virtual Task<bool> Updates(List<PBS.Vmo.PlaceVmo> vmoList)
        public virtual async Task<bool> Updates(List<PBS.Vmo.PlaceVmo> vmoList)
        {
            var dtoList = Vmo2UpdateDtos(vmoList);
            var bol = await _cal.Updates(dtoList);
            return bol;
        }


        /// <summary>
        /// æ›´æ–°æŽ’序码
        /// </summary>
        public async virtual Task<bool> UpdateSortCode(long ID, int SortCode)
        public virtual async Task<bool> UpdateSortCode(long ID, int SortCode)
        {
            var bol = await _cal.UpdateSortCode(ID, SortCode);
            return bol;
@@ -99,7 +98,7 @@
        /// <summary>
        /// æ‰¹é‡æ›´æ–°æŽ’序码
        /// </summary>
        public async virtual Task<bool> UpdateSorter(List<Yw.Vmo.Sorter> Sorters)
        public virtual async Task<bool> UpdateSorter(List<Yw.Vmo.Sorter> Sorters)
        {
            var dtoList = Sorters.ToDtoList();
            var bol = await _cal.UpdateSorter(dtoList);
@@ -109,7 +108,7 @@
        /// <summary>
        /// æ›´æ–° Flags
        /// </summary>
        public async virtual Task<bool> UpdateFlags(long ID, List<string> Flags)
        public virtual async Task<bool> UpdateFlags(long ID, List<string> Flags)
        {
            return await _cal.UpdateFlags(ID, Flags);
        }
@@ -117,7 +116,7 @@
        /// <summary>
        /// æ›´æ–° Paras
        /// </summary>
        public async virtual Task<bool> UpdateParas(long ID, Dictionary<string, string> Paras)
        public virtual async Task<bool> UpdateParas(long ID, Dictionary<string, string> Paras)
        {
            return await _cal.UpdateParas(ID, Paras);
        }
@@ -125,19 +124,27 @@
        /// <summary>
        /// æ›´æ–° TagName
        /// </summary>
        public async virtual Task<bool> UpdateTagName(long ID, string TagName)
        public virtual async Task<bool> UpdateTagName(long ID, string TagName)
        {
            return await _cal.UpdateTagName(ID, TagName);
        }

        #endregion
        /// <summary>
        /// æ›´æ–° UpdateUseStatus
        /// </summary>
        public virtual async Task<bool> UpdateUseStatus(long ID, Yw.Model.eUseStatus useStatus)
        {
            return await _cal.UpdateUseStatus(ID, (int)useStatus);
        }

        #endregion Update

        #region Exist

        /// <summary>
        /// åˆ¤æ–­ TagName æ˜¯å¦å­˜åœ¨
        /// </summary>
        public async virtual Task<bool> IsExistTagName(string TagName)
        public virtual async Task<bool> IsExistTagName(string TagName)
        {
            return await _cal.IsExistTagName(TagName);
        }
@@ -145,25 +152,24 @@
        /// <summary>
        /// åˆ¤æ–­ TagName æ˜¯å¦å­˜åœ¨ ExceptID
        /// </summary>
        public async virtual Task<bool> IsExistTagNameExceptID(string TagName, long ExceptID)
        public virtual async Task<bool> IsExistTagNameExceptID(string TagName, long ExceptID)
        {
            return await _cal.IsExistTagNameExceptID(TagName, ExceptID);
        }

        #endregion
        #endregion Exist

        #region Delete 
        #region Delete

        /// <summary>
        /// é€šè¿‡ ID åˆ é™¤
        /// </summary>
        public async virtual Task<bool> DeleteByID(long ID)
        public virtual async Task<bool> DeleteByID(long ID)
        {
            var bol = await _cal.DeleteByID(ID);
            return bol;
        }

        #endregion

        #endregion Delete
    }
}

 BLL/PBS.BLL/04-bll/02-facility/Facility.cs

@@ -4,10 +4,9 @@
{
    /// <summary>
    /// è®¾æ–½
    ///</summary>    
    ///</summary>
    public partial class Facility
    {

        private readonly PBS.CAL.IFacility _cal = CALCreateHelper.CreateCAL<PBS.CAL.IFacility>();

        #region Query
@@ -15,7 +14,7 @@
        /// <summary>
        /// èŽ·å–所有
        /// </summary>
        public async virtual Task<List<PBS.Vmo.FacilityVmo>> GetAll()
        public virtual async Task<List<PBS.Vmo.FacilityVmo>> GetAll()
        {
            var dtoList = await _cal.GetAll();
            return Dto2Vmos(dtoList);
@@ -24,7 +23,7 @@
        /// <summary>
        /// é€šè¿‡ ID èŽ·å–
        /// </summary>
        public async virtual Task<PBS.Vmo.FacilityVmo> GetByID(long ID)
        public virtual async Task<PBS.Vmo.FacilityVmo> GetByID(long ID)
        {
            var dto = await _cal.GetByID(ID);
            return Dto2Vmo(dto);
@@ -33,20 +32,20 @@
        /// <summary>
        /// é€šè¿‡ Ids èŽ·å–
        /// </summary>
        public async virtual Task<List<PBS.Vmo.FacilityVmo>> GetByIds(List<long> Ids)
        public virtual async Task<List<PBS.Vmo.FacilityVmo>> GetByIds(List<long> Ids)
        {
            var dtoList = await _cal.GetByIds(Ids);
            return Dto2Vmos(dtoList);
        }

        #endregion
        #endregion Query

        #region Insert

        /// <summary>
        /// æ’入一条
        /// </summary>
        public async virtual Task<long> Insert(PBS.Vmo.FacilityVmo vmo)
        public virtual async Task<long> Insert(PBS.Vmo.FacilityVmo vmo)
        {
            var dto = Vmo2AddDto(vmo);
            var id = await _cal.Insert(dto);
@@ -56,21 +55,21 @@
        /// <summary>
        /// æ’入多条
        /// </summary>
        public async virtual Task<bool> Inserts(List<PBS.Vmo.FacilityVmo> vmoList)
        public virtual async Task<bool> Inserts(List<PBS.Vmo.FacilityVmo> vmoList)
        {
            var dtoList = Vmo2AddDtos(vmoList);
            var bol = await _cal.Inserts(dtoList);
            return bol;
        }

        #endregion
        #endregion Insert

        #region Update

        /// <summary>
        /// æ›´æ–°
        /// </summary>
        public async virtual Task<bool> Update(PBS.Vmo.FacilityVmo vmo)
        public virtual async Task<bool> Update(PBS.Vmo.FacilityVmo vmo)
        {
            var dto = Vmo2UpdateDto(vmo);
            var bol = await _cal.Update(dto);
@@ -80,18 +79,17 @@
        /// <summary>
        /// æ‰¹é‡æ›´æ–°
        /// </summary>
        public async virtual Task<bool> Updates(List<PBS.Vmo.FacilityVmo> vmoList)
        public virtual async Task<bool> Updates(List<PBS.Vmo.FacilityVmo> vmoList)
        {
            var dtoList = Vmo2UpdateDtos(vmoList);
            var bol = await _cal.Updates(dtoList);
            return bol;
        }


        /// <summary>
        /// æ›´æ–°æŽ’序码
        /// </summary>
        public async virtual Task<bool> UpdateSortCode(long ID, int SortCode)
        public virtual async Task<bool> UpdateSortCode(long ID, int SortCode)
        {
            var bol = await _cal.UpdateSortCode(ID, SortCode);
            return bol;
@@ -100,7 +98,7 @@
        /// <summary>
        /// æ‰¹é‡æ›´æ–°æŽ’序码
        /// </summary>
        public async virtual Task<bool> UpdateSorter(List<Yw.Vmo.Sorter> Sorters)
        public virtual async Task<bool> UpdateSorter(List<Yw.Vmo.Sorter> Sorters)
        {
            var dtoList = Sorters.ToDtoList();
            var bol = await _cal.UpdateSorter(dtoList);
@@ -110,7 +108,7 @@
        /// <summary>
        /// æ›´æ–° Flags
        /// </summary>
        public async virtual Task<bool> UpdateFlags(long ID, List<string> Flags)
        public virtual async Task<bool> UpdateFlags(long ID, List<string> Flags)
        {
            return await _cal.UpdateFlags(ID, Flags);
        }
@@ -118,7 +116,7 @@
        /// <summary>
        /// æ›´æ–° Paras
        /// </summary>
        public async virtual Task<bool> UpdateParas(long ID, Dictionary<string, string> Paras)
        public virtual async Task<bool> UpdateParas(long ID, Dictionary<string, string> Paras)
        {
            return await _cal.UpdateParas(ID, Paras);
        }
@@ -126,19 +124,27 @@
        /// <summary>
        /// æ›´æ–° TagName
        /// </summary>
        public async virtual Task<bool> UpdateTagName(long ID, string TagName)
        public virtual async Task<bool> UpdateTagName(long ID, string TagName)
        {
            return await _cal.UpdateTagName(ID, TagName);
        }

        #endregion
        /// <summary>
        /// æ›´æ–° UpdateUseStatus
        /// </summary>
        public virtual async Task<bool> UpdateUseStatus(long ID, Yw.Model.eUseStatus useStatus)
        {
            return await _cal.UpdateUseStatus(ID, (int)useStatus);
        }

        #endregion Update

        #region Exist

        /// <summary>
        /// åˆ¤æ–­ TagName æ˜¯å¦å­˜åœ¨
        /// </summary>
        public async virtual Task<bool> IsExistTagName(string TagName)
        public virtual async Task<bool> IsExistTagName(string TagName)
        {
            return await _cal.IsExistTagName(TagName);
        }
@@ -146,25 +152,24 @@
        /// <summary>
        /// åˆ¤æ–­ TagName æ˜¯å¦å­˜åœ¨ ExceptID
        /// </summary>
        public async virtual Task<bool> IsExistTagNameExceptID(string TagName, long ExceptID)
        public virtual async Task<bool> IsExistTagNameExceptID(string TagName, long ExceptID)
        {
            return await _cal.IsExistTagNameExceptID(TagName, ExceptID);
        }

        #endregion
        #endregion Exist

        #region Delete 
        #region Delete

        /// <summary>
        /// é€šè¿‡ ID åˆ é™¤
        /// </summary>
        public async virtual Task<bool> DeleteByID(long ID)
        public virtual async Task<bool> DeleteByID(long ID)
        {
            var bol = await _cal.DeleteByID(ID);
            return bol;
        }

        #endregion

        #endregion Delete
    }
}

 Desktop/PBS.Desktop/MainForm.cs

@@ -1303,6 +1303,24 @@
                                CreatePage(page,guid);
                            }
                        }),
                        Get("厂商管理",new PageGuid()
                        {
                            Modular = "BasicData",
                            MoudingType = eMoudingType.Tab,
                            Function = "ManufacturerMgr",
                        }, svgImgItem32[12], new Size(18, 18), (caption,guid,svg,size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page=new  AssetsManufacturerMainPage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page,guid);
                            }
                        }),

                     }
                        };


 Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/AddManufacturerInput.cs

@@ -14,6 +14,7 @@
            this.Address = rhs.Address;
            this.Flags = rhs.Flags;
            this.TagName = rhs.TagName;
            this.UseStatus = rhs.UseStatus;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
        }

 Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/ManufacturerDto.cs

@@ -15,6 +15,7 @@
            this.Address = rhs.Address;
            this.Flags = rhs.Flags;
            this.TagName = rhs.TagName;
            this.UseStatus = rhs.UseStatus;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
        }

 Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturer.cs

@@ -7,7 +7,7 @@
    /// </summary>
    [SysType("assets_manufacturer")]
    [SugarTable("assets_manufacturer")]
    public class AssetsManufacturer : BaseEntity, IFlags, ITagName, ISorter, System.ICloneable
    public class AssetsManufacturer : BaseEntity, IFlags, ITagName, ISorter,IUseStatus, System.ICloneable
    {
        public AssetsManufacturer()
        { }
@@ -73,7 +73,7 @@
        /// æ ‡ç­¾åç§°
        /// </summary>
        public string TagName { get; set; }

 
        /// <summary>
        /// æŽ’序码
        /// </summary>
@@ -85,6 +85,11 @@
        public string Description { get; set; }

        /// <summary>
        /// ä½¿ç”¨çŠ¶æ€
        /// </summary>
        public int UseStatus { get; set; }

        /// <summary>
        ///
        /// </summary>
        public AssetsManufacturer Clone()

 Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturer.cs

@@ -6,7 +6,7 @@
    /// åŽ‚商
    /// </summary>
    [SysType("assets_manufacturer")]
    public class AssetsManufacturer : BaseModel, ISorter, ITagName, IFlags, System.ICloneable
    public class AssetsManufacturer : BaseModel, ISorter, ITagName, IFlags, IUseStatus, System.ICloneable
    {
        public AssetsManufacturer()
        { }
@@ -74,6 +74,11 @@
        public string TagName { get; set; }

        /// <summary>
        /// ä½¿ç”¨çŠ¶æ€
        /// </summary>
        public Yw.Model.eUseStatus UseStatus { get; set; }

        /// <summary>
        /// æŽ’序码
        /// </summary>
        public int SortCode { get; set; }

 Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer_Instance.cs

@@ -21,7 +21,7 @@
            if (entities == null || entities.Count < 1)
                return default;
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsManufacturer, Model.AssetsManufacturer>()
            .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
             .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
             ).CreateMapper();
            var models = mapper.Map<List<Entity.AssetsManufacturer>, List<Model.AssetsManufacturer>>(entities);
            return models;
@@ -33,7 +33,9 @@
            if (model == null)
                return default;
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsManufacturer, Entity.AssetsManufacturer>()
             ).CreateMapper();
               .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))

            ).CreateMapper();
            var entity = mapper.Map<Model.AssetsManufacturer, Entity.AssetsManufacturer>(model);
            return entity;
        }
@@ -44,6 +46,7 @@
            if (models == null || models.Count < 1)
                return default;
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsManufacturer, Entity.AssetsManufacturer>()
           .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
             ).CreateMapper();
            var entities = mapper.Map<List<Model.AssetsManufacturer>, List<Entity.AssetsManufacturer>>(models);
            return entities;
@@ -55,7 +58,8 @@
            if (model == null || entity == null)
                return;
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsManufacturer, Entity.AssetsManufacturer>()
              ).CreateMapper();
             .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
             ).CreateMapper();
            mapper.Map(model, entity);
        }
    }

 Vmo/PBS.Vmo/00-core/ePropertyType.cs

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

namespace PBS.Vmo
{
    public enum ePropertyType
    {
        /// <summary>
        /// å…¬å¯“住宅
        /// </summary>
        [Display(Name = "公寓住宅")]
        Building = 0
    }
}

 Vmo/PBS.Vmo/01-place/01-place-info/PlaceBuildParasInfoVmo.cs

@@ -7,7 +7,7 @@
        /// <summary>
        /// ç‰©ä¸šç±»åž‹
        /// </summary>
        public long? PropertyType { get; set; }
        public ePropertyType PropertyType { get; set; }

        /// <summary>
        /// ç«£å·¥æ—¶é—´

 WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.cs

@@ -1,4 +1,6 @@
using HStation.WinFrmUI.Assets;
using DevExpress.XtraBars;
using HStation.WinFrmUI.Assets;
using Yw;

namespace HStation.WinFrmUI
{
@@ -204,5 +206,28 @@
        }

        #endregion äº‹ä»¶

        private void BtnUseStatus_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
            if (vm == null)
            {
                return;
            }
            var dlg = new SetUseStatusDlg();
            dlg.SetBindingData((Yw.Model.eUseStatus)vm.UseStatus);
            dlg.ReloadDataEvent += async (status) =>
            {
                var bol = await BLLFactory<Yw.BLL.User>.Instance.UpdateUseStatus(vm.ID, status);
                if (bol)
                {
                    vm.UseStatus = status;
                    this.gridView1.RefreshRow(this.gridView1.FocusedRowHandle);
                    return true;
                }
                return false;
            };
            dlg.ShowDialog();
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs

@@ -42,6 +42,7 @@
            barBtnDetail = new DevExpress.XtraBars.BarButtonItem();
            barBtnUpdateTagName = new DevExpress.XtraBars.BarButtonItem();
            barCekSearch = new DevExpress.XtraBars.BarCheckItem();
            BtnUseStatus = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -53,30 +54,30 @@
            colAddress = new DevExpress.XtraGrid.Columns.GridColumn();
            colTagName = new DevExpress.XtraGrid.Columns.GridColumn();
            colUseStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            currentViewModelBindingSource = new BindingSource(components);
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)manufacurerViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)currentViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // ribbonControl1
            // 
            ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnUpdateSortCode, barBtnDetail, barBtnUpdateTagName, barCekSearch });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnUpdateSortCode, barBtnDetail, barBtnUpdateTagName, barCekSearch, BtnUseStatus });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 28;
            ribbonControl1.Margin = new Padding(3, 4, 3, 4);
            ribbonControl1.MaxItemId = 29;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.OptionsMenuMinWidth = 377;
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
            ribbonControl1.Size = new Size(818, 77);
            ribbonControl1.Size = new Size(935, 128);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // barBtnAdd
@@ -143,6 +144,14 @@
            barCekSearch.Name = "barCekSearch";
            barCekSearch.CheckedChanged += barCekSearch_CheckedChanged;
            // 
            // BtnUseStatus
            // 
            BtnUseStatus.Caption = "使用状态";
            BtnUseStatus.Id = 28;
            BtnUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnUseState.ImageOptions.SvgImage");
            BtnUseStatus.Name = "BtnUseStatus";
            BtnUseStatus.ItemClick += BtnUseStatus_ItemClick;
            // 
            // ribbonPage
            // 
            ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
@@ -159,6 +168,7 @@
            ribbonPageGroup1.ItemLinks.Add(barBtnUpdateSortCode);
            ribbonPageGroup1.ItemLinks.Add(barCekSearch);
            ribbonPageGroup1.ItemLinks.Add(barBtnRefresh);
            ribbonPageGroup1.ItemLinks.Add(BtnUseStatus);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "基础";
            // 
@@ -166,13 +176,13 @@
            // 
            gridControl1.DataSource = manufacurerViewModelBindingSource;
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.EmbeddedNavigator.Margin = new Padding(2);
            gridControl1.Location = new Point(0, 77);
            gridControl1.EmbeddedNavigator.Margin = new Padding(2, 3, 2, 3);
            gridControl1.Location = new Point(0, 128);
            gridControl1.MainView = gridView1;
            gridControl1.Margin = new Padding(2);
            gridControl1.Margin = new Padding(2, 3, 2, 3);
            gridControl1.MenuManager = ribbonControl1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(818, 604);
            gridControl1.Size = new Size(935, 748);
            gridControl1.TabIndex = 22;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -182,84 +192,91 @@
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colContacter, colTelephone, colAddress, colTagName, colUseStatus, colSortCode, colDescription });
            gridView1.DetailHeight = 223;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colContacter, colTelephone, colAddress, colTagName, colUseStatus, colDescription });
            gridView1.DetailHeight = 287;
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsEditForm.PopupEditFormWidth = 560;
            gridView1.OptionsEditForm.PopupEditFormWidth = 640;
            gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // colName
            // 
            colName.FieldName = "Name";
            colName.MinWidth = 23;
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 0;
            colName.Width = 86;
            // 
            // colContacter
            // 
            colContacter.FieldName = "Contacter";
            colContacter.MinWidth = 23;
            colContacter.Name = "colContacter";
            colContacter.Visible = true;
            colContacter.VisibleIndex = 1;
            colContacter.Width = 86;
            // 
            // colTelephone
            // 
            colTelephone.FieldName = "Telephone";
            colTelephone.MinWidth = 23;
            colTelephone.Name = "colTelephone";
            colTelephone.Visible = true;
            colTelephone.VisibleIndex = 2;
            colTelephone.Width = 86;
            // 
            // colAddress
            // 
            colAddress.FieldName = "Address";
            colAddress.MinWidth = 23;
            colAddress.Name = "colAddress";
            colAddress.Visible = true;
            colAddress.VisibleIndex = 3;
            colAddress.Width = 86;
            // 
            // colTagName
            // 
            colTagName.FieldName = "TagName";
            colTagName.MinWidth = 23;
            colTagName.Name = "colTagName";
            colTagName.Visible = true;
            colTagName.VisibleIndex = 4;
            colTagName.Width = 86;
            // 
            // colUseStatus
            // 
            colUseStatus.FieldName = "UseStatus";
            colUseStatus.MinWidth = 23;
            colUseStatus.Name = "colUseStatus";
            colUseStatus.Visible = true;
            colUseStatus.VisibleIndex = 5;
            // 
            // colSortCode
            // 
            colSortCode.FieldName = "SortCode";
            colSortCode.Name = "colSortCode";
            colSortCode.Visible = true;
            colSortCode.VisibleIndex = 6;
            colUseStatus.Width = 86;
            // 
            // colDescription
            // 
            colDescription.FieldName = "Description";
            colDescription.MinWidth = 23;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 7;
            colDescription.VisibleIndex = 6;
            colDescription.Width = 86;
            // 
            // AssetsManufacturerMainPage
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleDimensions = new SizeF(8F, 18F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(gridControl1);
            Controls.Add(ribbonControl1);
            Margin = new Padding(3, 5, 3, 5);
            Name = "AssetsManufacturerMainPage";
            Size = new Size(818, 681);
            Size = new Size(935, 876);
            ((ISupportInitialize)ribbonControl1).EndInit();
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)manufacurerViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)currentViewModelBindingSource).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -277,7 +294,6 @@
        private DevExpress.XtraBars.BarButtonItem barBtnUpdateTagName;
        private DevExpress.XtraBars.BarCheckItem barCekSearch;
        private DevExpress.XtraGrid.GridControl gridControl1;
        private BindingSource currentViewModelBindingSource;
        private GridView gridView1;
        private BindingSource manufacurerViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
@@ -286,7 +302,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn colAddress;
        private DevExpress.XtraGrid.Columns.GridColumn colTagName;
        private DevExpress.XtraGrid.Columns.GridColumn colUseStatus;
        private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private DevExpress.XtraBars.BarButtonItem BtnUseStatus;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.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
@@ -295,11 +295,31 @@
        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="BtnUseState.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu
        MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu
        MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww
        LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt
        MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs
        OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K
        ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y
        LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9
        IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
  <metadata name="manufacurerViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>262, 17</value>
  </metadata>
  <metadata name="currentViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>75</value>

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.Designer.cs

@@ -28,13 +28,13 @@
        /// </summary>
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddAssetsPackageMainDlg));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            components = new Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(AddAssetsPackageMainDlg));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            pumpAccountViewModelBindingSource = new BindingSource(components);
@@ -52,7 +52,7 @@
            DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
            textEditNo = new DevExpress.XtraEditors.TextEdit();
            textEditCatalog = new DevExpress.XtraEditors.ImageComboBoxEdit();
            textEditReserveCount = new DevExpress.XtraEditors.TextEdit();
            textEditUseCount = new DevExpress.XtraEditors.TextEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -74,39 +74,39 @@
            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            toolTipController1 = new DevExpress.Utils.ToolTipController(components);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)pumpAccountViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditNo.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditCatalog.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditReserveCount.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem15).BeginInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)pumpAccountViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1).BeginInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).BeginInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((ISupportInitialize)textEditName.Properties).BeginInit();
            ((ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
            ((ISupportInitialize)textEditNo.Properties).BeginInit();
            ((ISupportInitialize)textEditCatalog.Properties).BeginInit();
            ((ISupportInitialize)textEditUseCount.Properties).BeginInit();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlGroup5).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)layoutControlItem9).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)layoutControlItem13).BeginInit();
            ((ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem15).BeginInit();
            ((ISupportInitialize)imageComboBoxEdit2.Properties).BeginInit();
            ((ISupportInitialize)tabbedControlGroup2).BeginInit();
            ((ISupportInitialize)layoutControlGroup3).BeginInit();
            ((ISupportInitialize)layoutControlGroup4).BeginInit();
            ((ISupportInitialize)layoutControlItem27).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -118,24 +118,27 @@
            layoutControl1.Controls.Add(DescriptionTextEdit);
            layoutControl1.Controls.Add(textEditNo);
            layoutControl1.Controls.Add(textEditCatalog);
            layoutControl1.Controls.Add(textEditReserveCount);
            layoutControl1.Controls.Add(textEditUseCount);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Margin = new Padding(3, 4, 3, 4);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(971, 225, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(681, 482);
            layoutControl1.Size = new Size(778, 620);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // gridControl1
            // 
            gridControl1.DataSource = pumpAccountViewModelBindingSource;
            gridControl1.Location = new Point(8, 56);
            gridControl1.EmbeddedNavigator.Margin = new Padding(3, 5, 3, 5);
            gridControl1.Location = new Point(9, 66);
            gridControl1.MainView = gridView1;
            gridControl1.Margin = new Padding(3, 4, 3, 4);
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemTreeListLookUpEdit1, repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(665, 133);
            gridControl1.Size = new Size(760, 174);
            gridControl1.TabIndex = 5;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -148,6 +151,7 @@
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colPumpID, colUserCount, ColDelete });
            gridView1.DetailHeight = 450;
            gridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
@@ -155,6 +159,7 @@
            gridView1.OptionsCustomization.AllowFilter = false;
            gridView1.OptionsCustomization.AllowQuickHideColumns = false;
            gridView1.OptionsCustomization.AllowSort = false;
            gridView1.OptionsEditForm.PopupEditFormWidth = 914;
            gridView1.OptionsMenu.EnableColumnMenu = false;
            gridView1.OptionsMenu.EnableFooterMenu = false;
            gridView1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
@@ -168,10 +173,11 @@
            colPumpID.Caption = "泵型号";
            colPumpID.ColumnEdit = repositoryItemTreeListLookUpEdit1;
            colPumpID.FieldName = "PumpID";
            colPumpID.MinWidth = 23;
            colPumpID.Name = "colPumpID";
            colPumpID.Visible = true;
            colPumpID.VisibleIndex = 0;
            colPumpID.Width = 598;
            colPumpID.Width = 683;
            // 
            // repositoryItemTreeListLookUpEdit1
            // 
@@ -188,18 +194,22 @@
            // 
            repositoryItemTreeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
            repositoryItemTreeListLookUpEdit1TreeList.Location = new Point(0, 0);
            repositoryItemTreeListLookUpEdit1TreeList.MinWidth = 23;
            repositoryItemTreeListLookUpEdit1TreeList.Name = "repositoryItemTreeListLookUpEdit1TreeList";
            repositoryItemTreeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
            repositoryItemTreeListLookUpEdit1TreeList.Size = new Size(400, 200);
            repositoryItemTreeListLookUpEdit1TreeList.TabIndex = 0;
            repositoryItemTreeListLookUpEdit1TreeList.TreeLevelWidth = 21;
            // 
            // treeListColumn1
            // 
            treeListColumn1.Caption = "泵型号";
            treeListColumn1.FieldName = "Name";
            treeListColumn1.MinWidth = 23;
            treeListColumn1.Name = "treeListColumn1";
            treeListColumn1.Visible = true;
            treeListColumn1.VisibleIndex = 0;
            treeListColumn1.Width = 86;
            // 
            // colUserCount
            // 
@@ -207,10 +217,9 @@
            colUserCount.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colUserCount.Caption = "使用数量";
            colUserCount.FieldName = "UserCount";
            colUserCount.MinWidth = 23;
            colUserCount.Name = "colUserCount";
            colUserCount.Visible = true;
            colUserCount.VisibleIndex = 1;
            colUserCount.Width = 170;
            colUserCount.Width = 194;
            // 
            // ColDelete
            // 
@@ -218,17 +227,18 @@
            ColDelete.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            ColDelete.Caption = "删除";
            ColDelete.ColumnEdit = repositoryItemButtonEdit1;
            ColDelete.MinWidth = 23;
            ColDelete.Name = "ColDelete";
            ColDelete.OptionsColumn.AllowEdit = false;
            ColDelete.Visible = true;
            ColDelete.VisibleIndex = 2;
            ColDelete.Width = 133;
            ColDelete.VisibleIndex = 1;
            ColDelete.Width = 152;
            // 
            // repositoryItemButtonEdit1
            // 
            repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
@@ -236,9 +246,10 @@
            // 
            BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            BtnOk.Appearance.Options.UseBackColor = true;
            BtnOk.Location = new Point(495, 452);
            BtnOk.Location = new Point(565, 583);
            BtnOk.Margin = new Padding(3, 4, 3, 4);
            BtnOk.Name = "BtnOk";
            BtnOk.Size = new Size(89, 22);
            BtnOk.Size = new Size(102, 27);
            BtnOk.StyleController = layoutControl1;
            BtnOk.TabIndex = 7;
            BtnOk.Text = "确定";
@@ -249,53 +260,59 @@
            simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            simpleButton1.Appearance.Options.UseBackColor = true;
            simpleButton1.DialogResult = DialogResult.Cancel;
            simpleButton1.Location = new Point(588, 452);
            simpleButton1.Location = new Point(671, 583);
            simpleButton1.Margin = new Padding(3, 4, 3, 4);
            simpleButton1.Name = "simpleButton1";
            simpleButton1.Size = new Size(85, 22);
            simpleButton1.Size = new Size(98, 27);
            simpleButton1.StyleController = layoutControl1;
            simpleButton1.TabIndex = 8;
            simpleButton1.Text = "取消";
            // 
            // textEditName
            // 
            textEditName.Location = new Point(72, 8);
            textEditName.Location = new Point(86, 10);
            textEditName.Margin = new Padding(3, 4, 3, 4);
            textEditName.Name = "textEditName";
            textEditName.Size = new Size(266, 20);
            textEditName.Size = new Size(300, 24);
            textEditName.StyleController = layoutControl1;
            textEditName.TabIndex = 0;
            // 
            // DescriptionTextEdit
            // 
            DescriptionTextEdit.Location = new Point(20, 226);
            DescriptionTextEdit.Location = new Point(21, 282);
            DescriptionTextEdit.Margin = new Padding(3, 4, 3, 4);
            DescriptionTextEdit.Name = "DescriptionTextEdit";
            DescriptionTextEdit.Size = new Size(641, 210);
            DescriptionTextEdit.Size = new Size(736, 285);
            DescriptionTextEdit.StyleController = layoutControl1;
            DescriptionTextEdit.TabIndex = 6;
            // 
            // textEditNo
            // 
            textEditNo.Location = new Point(406, 8);
            textEditNo.Location = new Point(467, 10);
            textEditNo.Margin = new Padding(3, 4, 3, 4);
            textEditNo.Name = "textEditNo";
            textEditNo.Size = new Size(267, 20);
            textEditNo.Size = new Size(302, 24);
            textEditNo.StyleController = layoutControl1;
            textEditNo.TabIndex = 2;
            // 
            // textEditCatalog
            // 
            textEditCatalog.Location = new Point(72, 32);
            textEditCatalog.Location = new Point(86, 38);
            textEditCatalog.Margin = new Padding(3, 4, 3, 4);
            textEditCatalog.Name = "textEditCatalog";
            textEditCatalog.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            textEditCatalog.Size = new Size(266, 20);
            textEditCatalog.Size = new Size(300, 24);
            textEditCatalog.StyleController = layoutControl1;
            textEditCatalog.TabIndex = 3;
            // 
            // textEditReserveCount
            // textEditUseCount
            // 
            textEditReserveCount.Location = new Point(406, 32);
            textEditReserveCount.Name = "textEditReserveCount";
            textEditReserveCount.Size = new Size(267, 20);
            textEditReserveCount.StyleController = layoutControl1;
            textEditReserveCount.TabIndex = 4;
            textEditUseCount.Location = new Point(467, 38);
            textEditUseCount.Margin = new Padding(3, 4, 3, 4);
            textEditUseCount.Name = "textEditUseCount";
            textEditUseCount.Size = new Size(302, 24);
            textEditUseCount.StyleController = layoutControl1;
            textEditUseCount.TabIndex = 4;
            // 
            // Root
            // 
@@ -305,33 +322,33 @@
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlGroup5, layoutControlItem2, layoutControlItem7, layoutControlItem9, layoutControlItem3 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
            Root.Size = new Size(681, 482);
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(7, 7, 8, 8);
            Root.Size = new Size(778, 620);
            Root.TextVisible = false;
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = BtnOk;
            layoutControlItem4.Location = new Point(487, 444);
            layoutControlItem4.Location = new Point(556, 573);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(93, 26);
            layoutControlItem4.Size = new Size(106, 31);
            layoutControlItem4.TextSize = new Size(0, 0);
            layoutControlItem4.TextVisible = false;
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 444);
            emptySpaceItem1.Location = new Point(0, 573);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(487, 26);
            emptySpaceItem1.Size = new Size(556, 31);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = simpleButton1;
            layoutControlItem8.Location = new Point(580, 444);
            layoutControlItem8.Location = new Point(662, 573);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(89, 26);
            layoutControlItem8.Size = new Size(102, 31);
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            // 
@@ -341,18 +358,18 @@
            layoutControlItem1.Control = textEditName;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(334, 24);
            layoutControlItem1.Size = new Size(381, 28);
            layoutControlItem1.Text = "<color=red>*</color>名称:";
            layoutControlItem1.TextSize = new Size(52, 14);
            layoutControlItem1.TextSize = new Size(65, 18);
            // 
            // layoutControlGroup5
            // 
            layoutControlGroup5.AppearanceGroup.FontSizeDelta = 1;
            layoutControlGroup5.AppearanceGroup.Options.UseFont = true;
            layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
            layoutControlGroup5.Location = new Point(0, 185);
            layoutControlGroup5.Location = new Point(0, 234);
            layoutControlGroup5.Name = "layoutControlGroup5";
            layoutControlGroup5.Size = new Size(669, 259);
            layoutControlGroup5.Size = new Size(764, 339);
            layoutControlGroup5.Text = "说明";
            // 
            // layoutControlItem5
@@ -360,7 +377,7 @@
            layoutControlItem5.Control = DescriptionTextEdit;
            layoutControlItem5.Location = new Point(0, 0);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(645, 214);
            layoutControlItem5.Size = new Size(740, 289);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem5.TextSize = new Size(0, 0);
@@ -370,38 +387,38 @@
            // layoutControlItem2
            // 
            layoutControlItem2.Control = textEditNo;
            layoutControlItem2.Location = new Point(334, 0);
            layoutControlItem2.Location = new Point(381, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(335, 24);
            layoutControlItem2.Size = new Size(383, 28);
            layoutControlItem2.Text = "编号:";
            layoutControlItem2.TextSize = new Size(52, 14);
            layoutControlItem2.TextSize = new Size(65, 18);
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = textEditCatalog;
            layoutControlItem7.Location = new Point(0, 24);
            layoutControlItem7.Location = new Point(0, 28);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(334, 24);
            layoutControlItem7.Size = new Size(381, 28);
            layoutControlItem7.Text = "分类:";
            layoutControlItem7.TextSize = new Size(52, 14);
            layoutControlItem7.TextSize = new Size(65, 18);
            // 
            // layoutControlItem9
            // 
            layoutControlItem9.Control = gridControl1;
            layoutControlItem9.Location = new Point(0, 48);
            layoutControlItem9.Location = new Point(0, 56);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(669, 137);
            layoutControlItem9.Size = new Size(764, 178);
            layoutControlItem9.TextSize = new Size(0, 0);
            layoutControlItem9.TextVisible = false;
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = textEditReserveCount;
            layoutControlItem3.Location = new Point(334, 24);
            layoutControlItem3.Control = textEditUseCount;
            layoutControlItem3.Location = new Point(381, 28);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(335, 24);
            layoutControlItem3.Text = "设备数量:";
            layoutControlItem3.TextSize = new Size(52, 14);
            layoutControlItem3.Size = new Size(383, 28);
            layoutControlItem3.Text = "使用数量:";
            layoutControlItem3.TextSize = new Size(65, 18);
            // 
            // dxErrorProvider1
            // 
@@ -475,46 +492,47 @@
            // 
            // AddAssetsPackageMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleDimensions = new SizeF(8F, 18F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(681, 482);
            ClientSize = new Size(778, 620);
            Controls.Add(layoutControl1);
            Margin = new Padding(3, 4, 3, 4);
            Name = "AddAssetsPackageMainDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "添加成套设备";
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)pumpAccountViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditNo.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditCatalog.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditReserveCount.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem15).EndInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)pumpAccountViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1).EndInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).EndInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((ISupportInitialize)textEditName.Properties).EndInit();
            ((ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
            ((ISupportInitialize)textEditNo.Properties).EndInit();
            ((ISupportInitialize)textEditCatalog.Properties).EndInit();
            ((ISupportInitialize)textEditUseCount.Properties).EndInit();
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlGroup5).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)layoutControlItem9).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)layoutControlItem13).EndInit();
            ((ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem15).EndInit();
            ((ISupportInitialize)imageComboBoxEdit2.Properties).EndInit();
            ((ISupportInitialize)tabbedControlGroup2).EndInit();
            ((ISupportInitialize)layoutControlGroup3).EndInit();
            ((ISupportInitialize)layoutControlGroup4).EndInit();
            ((ISupportInitialize)layoutControlItem27).EndInit();
            ResumeLayout(false);
        }

@@ -561,7 +579,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn colUserCount;
        private DevExpress.XtraGrid.Columns.GridColumn ColDelete;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.TextEdit textEditReserveCount;
        private DevExpress.XtraEditors.TextEdit textEditUseCount;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.cs

@@ -56,12 +56,20 @@
                this.dxErrorProvider1.SetError(this.textEditName, "必填项");
                return false;
            }
            if (string.IsNullOrEmpty(textEditReserveCount.Text.Trim()))
            if (string.IsNullOrEmpty(textEditUseCount.Text.Trim()))
            {
                this.dxErrorProvider1.SetError(this.textEditReserveCount, "必填项");
                this.dxErrorProvider1.SetError(this.textEditUseCount, "必填项");
                return false;
            }

            if (_allBindingList != null)
            {
                int.TryParse(textEditUseCount.Text, out int UseCount);
                if (UseCount < _allBindingList.Count)
                {
                    TipFormHelper.ShowError("使用数量大于泵数量");
                    return false;
                }
            }
            return true;
        }

@@ -73,9 +81,9 @@
            _EquipmentVmo.Description = DescriptionTextEdit.Text.Trim();
            _EquipmentVmo.Name = textEditName.Text.Trim();
            _EquipmentVmo.NO = textEditNo.Text.Trim();
            if (int.TryParse(this.textEditReserveCount.Text, out int equipmentCount))
            if (int.TryParse(this.textEditUseCount.Text, out int equipmentCount))
            {
                _EquipmentVmo.PumpTotal = equipmentCount;
                _EquipmentVmo.PumpUseCount = equipmentCount;
            }
            if (long.TryParse(textEditCatalog.EditValue?.ToString() ?? "", out long catalogID))
            {

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.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
@@ -121,7 +121,7 @@
    <value>333, 17</value>
  </metadata>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions2.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.Designer.cs

@@ -28,13 +28,13 @@
        /// </summary>
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditAssetsPackageMainDlg));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            components = new Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(EditAssetsPackageMainDlg));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            pumpAccountViewModelBindingSource = new BindingSource(components);
@@ -52,7 +52,7 @@
            textEditDescription = new DevExpress.XtraEditors.MemoEdit();
            textEditNo = new DevExpress.XtraEditors.TextEdit();
            textEditCatalog = new DevExpress.XtraEditors.ImageComboBoxEdit();
            textEditEquipmentCount = new DevExpress.XtraEditors.TextEdit();
            textEditUseCount = new DevExpress.XtraEditors.TextEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -74,39 +74,39 @@
            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            toolTipController1 = new DevExpress.Utils.ToolTipController(components);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)pumpAccountViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditDescription.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditNo.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditCatalog.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditEquipmentCount.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem15).BeginInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)pumpAccountViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1).BeginInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).BeginInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((ISupportInitialize)textEditName.Properties).BeginInit();
            ((ISupportInitialize)textEditDescription.Properties).BeginInit();
            ((ISupportInitialize)textEditNo.Properties).BeginInit();
            ((ISupportInitialize)textEditCatalog.Properties).BeginInit();
            ((ISupportInitialize)textEditUseCount.Properties).BeginInit();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlGroup5).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)layoutControlItem9).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)layoutControlItem13).BeginInit();
            ((ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem15).BeginInit();
            ((ISupportInitialize)imageComboBoxEdit2.Properties).BeginInit();
            ((ISupportInitialize)tabbedControlGroup2).BeginInit();
            ((ISupportInitialize)layoutControlGroup3).BeginInit();
            ((ISupportInitialize)layoutControlGroup4).BeginInit();
            ((ISupportInitialize)layoutControlItem27).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -118,24 +118,27 @@
            layoutControl1.Controls.Add(textEditDescription);
            layoutControl1.Controls.Add(textEditNo);
            layoutControl1.Controls.Add(textEditCatalog);
            layoutControl1.Controls.Add(textEditEquipmentCount);
            layoutControl1.Controls.Add(textEditUseCount);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Margin = new Padding(3, 4, 3, 4);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(971, 225, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(681, 482);
            layoutControl1.Size = new Size(778, 620);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // gridControl1
            // 
            gridControl1.DataSource = pumpAccountViewModelBindingSource;
            gridControl1.Location = new Point(8, 56);
            gridControl1.EmbeddedNavigator.Margin = new Padding(3, 5, 3, 5);
            gridControl1.Location = new Point(9, 71);
            gridControl1.MainView = gridView1;
            gridControl1.Margin = new Padding(3, 4, 3, 4);
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemTreeListLookUpEdit1, repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(665, 133);
            gridControl1.Size = new Size(760, 171);
            gridControl1.TabIndex = 5;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -148,6 +151,7 @@
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colPumpID, colUserCount, ColDelete });
            gridView1.DetailHeight = 450;
            gridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
@@ -155,6 +159,7 @@
            gridView1.OptionsCustomization.AllowFilter = false;
            gridView1.OptionsCustomization.AllowQuickHideColumns = false;
            gridView1.OptionsCustomization.AllowSort = false;
            gridView1.OptionsEditForm.PopupEditFormWidth = 914;
            gridView1.OptionsMenu.EnableColumnMenu = false;
            gridView1.OptionsMenu.EnableFooterMenu = false;
            gridView1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
@@ -168,10 +173,11 @@
            colPumpID.Caption = "泵型号";
            colPumpID.ColumnEdit = repositoryItemTreeListLookUpEdit1;
            colPumpID.FieldName = "PumpID";
            colPumpID.MinWidth = 23;
            colPumpID.Name = "colPumpID";
            colPumpID.Visible = true;
            colPumpID.VisibleIndex = 0;
            colPumpID.Width = 598;
            colPumpID.Width = 683;
            // 
            // repositoryItemTreeListLookUpEdit1
            // 
@@ -188,18 +194,22 @@
            // 
            repositoryItemTreeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
            repositoryItemTreeListLookUpEdit1TreeList.Location = new Point(0, 0);
            repositoryItemTreeListLookUpEdit1TreeList.MinWidth = 23;
            repositoryItemTreeListLookUpEdit1TreeList.Name = "repositoryItemTreeListLookUpEdit1TreeList";
            repositoryItemTreeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
            repositoryItemTreeListLookUpEdit1TreeList.Size = new Size(400, 200);
            repositoryItemTreeListLookUpEdit1TreeList.TabIndex = 0;
            repositoryItemTreeListLookUpEdit1TreeList.TreeLevelWidth = 21;
            // 
            // treeListColumn1
            // 
            treeListColumn1.Caption = "泵型号";
            treeListColumn1.FieldName = "Name";
            treeListColumn1.MinWidth = 23;
            treeListColumn1.Name = "treeListColumn1";
            treeListColumn1.Visible = true;
            treeListColumn1.VisibleIndex = 0;
            treeListColumn1.Width = 86;
            // 
            // colUserCount
            // 
@@ -207,10 +217,9 @@
            colUserCount.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colUserCount.Caption = "使用数量";
            colUserCount.FieldName = "UserCount";
            colUserCount.MinWidth = 23;
            colUserCount.Name = "colUserCount";
            colUserCount.Visible = true;
            colUserCount.VisibleIndex = 1;
            colUserCount.Width = 170;
            colUserCount.Width = 194;
            // 
            // ColDelete
            // 
@@ -218,17 +227,18 @@
            ColDelete.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            ColDelete.Caption = "删除";
            ColDelete.ColumnEdit = repositoryItemButtonEdit1;
            ColDelete.MinWidth = 23;
            ColDelete.Name = "ColDelete";
            ColDelete.OptionsColumn.AllowEdit = false;
            ColDelete.Visible = true;
            ColDelete.VisibleIndex = 2;
            ColDelete.Width = 133;
            ColDelete.VisibleIndex = 1;
            ColDelete.Width = 152;
            // 
            // repositoryItemButtonEdit1
            // 
            repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
@@ -236,9 +246,10 @@
            // 
            BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            BtnOk.Appearance.Options.UseBackColor = true;
            BtnOk.Location = new Point(495, 452);
            BtnOk.Location = new Point(565, 582);
            BtnOk.Margin = new Padding(3, 4, 3, 4);
            BtnOk.Name = "BtnOk";
            BtnOk.Size = new Size(89, 22);
            BtnOk.Size = new Size(102, 27);
            BtnOk.StyleController = layoutControl1;
            BtnOk.TabIndex = 7;
            BtnOk.Text = "确定";
@@ -249,53 +260,59 @@
            simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            simpleButton1.Appearance.Options.UseBackColor = true;
            simpleButton1.DialogResult = DialogResult.Cancel;
            simpleButton1.Location = new Point(588, 452);
            simpleButton1.Location = new Point(671, 582);
            simpleButton1.Margin = new Padding(3, 4, 3, 4);
            simpleButton1.Name = "simpleButton1";
            simpleButton1.Size = new Size(85, 22);
            simpleButton1.Size = new Size(98, 27);
            simpleButton1.StyleController = layoutControl1;
            simpleButton1.TabIndex = 8;
            simpleButton1.Text = "取消";
            // 
            // textEditName
            // 
            textEditName.Location = new Point(72, 8);
            textEditName.Location = new Point(88, 11);
            textEditName.Margin = new Padding(3, 4, 3, 4);
            textEditName.Name = "textEditName";
            textEditName.Size = new Size(266, 20);
            textEditName.Size = new Size(298, 24);
            textEditName.StyleController = layoutControl1;
            textEditName.TabIndex = 0;
            // 
            // textEditDescription
            // 
            textEditDescription.Location = new Point(20, 226);
            textEditDescription.Location = new Point(22, 290);
            textEditDescription.Margin = new Padding(3, 4, 3, 4);
            textEditDescription.Name = "textEditDescription";
            textEditDescription.Size = new Size(641, 210);
            textEditDescription.Size = new Size(734, 270);
            textEditDescription.StyleController = layoutControl1;
            textEditDescription.TabIndex = 6;
            // 
            // textEditNo
            // 
            textEditNo.Location = new Point(406, 8);
            textEditNo.Location = new Point(469, 11);
            textEditNo.Margin = new Padding(3, 4, 3, 4);
            textEditNo.Name = "textEditNo";
            textEditNo.Size = new Size(267, 20);
            textEditNo.Size = new Size(300, 24);
            textEditNo.StyleController = layoutControl1;
            textEditNo.TabIndex = 2;
            // 
            // textEditCatalog
            // 
            textEditCatalog.Location = new Point(72, 32);
            textEditCatalog.Location = new Point(88, 41);
            textEditCatalog.Margin = new Padding(3, 4, 3, 4);
            textEditCatalog.Name = "textEditCatalog";
            textEditCatalog.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            textEditCatalog.Size = new Size(266, 20);
            textEditCatalog.Size = new Size(298, 24);
            textEditCatalog.StyleController = layoutControl1;
            textEditCatalog.TabIndex = 3;
            // 
            // textEditEquipmentCount
            // textEditUseCount
            // 
            textEditEquipmentCount.Location = new Point(406, 32);
            textEditEquipmentCount.Name = "textEditEquipmentCount";
            textEditEquipmentCount.Size = new Size(267, 20);
            textEditEquipmentCount.StyleController = layoutControl1;
            textEditEquipmentCount.TabIndex = 4;
            textEditUseCount.Location = new Point(469, 41);
            textEditUseCount.Margin = new Padding(3, 4, 3, 4);
            textEditUseCount.Name = "textEditUseCount";
            textEditUseCount.Size = new Size(300, 24);
            textEditUseCount.StyleController = layoutControl1;
            textEditUseCount.TabIndex = 4;
            // 
            // Root
            // 
@@ -305,33 +322,33 @@
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlGroup5, layoutControlItem2, layoutControlItem7, layoutControlItem9, layoutControlItem3 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
            Root.Size = new Size(681, 482);
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(7, 7, 8, 8);
            Root.Size = new Size(778, 620);
            Root.TextVisible = false;
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = BtnOk;
            layoutControlItem4.Location = new Point(487, 444);
            layoutControlItem4.Location = new Point(556, 571);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(93, 26);
            layoutControlItem4.Size = new Size(106, 33);
            layoutControlItem4.TextSize = new Size(0, 0);
            layoutControlItem4.TextVisible = false;
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 444);
            emptySpaceItem1.Location = new Point(0, 571);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(487, 26);
            emptySpaceItem1.Size = new Size(556, 33);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = simpleButton1;
            layoutControlItem8.Location = new Point(580, 444);
            layoutControlItem8.Location = new Point(662, 571);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(89, 26);
            layoutControlItem8.Size = new Size(102, 33);
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            // 
@@ -341,18 +358,18 @@
            layoutControlItem1.Control = textEditName;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(334, 24);
            layoutControlItem1.Size = new Size(381, 30);
            layoutControlItem1.Text = "<color=red>*</color>名称:";
            layoutControlItem1.TextSize = new Size(52, 14);
            layoutControlItem1.TextSize = new Size(65, 18);
            // 
            // layoutControlGroup5
            // 
            layoutControlGroup5.AppearanceGroup.FontSizeDelta = 1;
            layoutControlGroup5.AppearanceGroup.Options.UseFont = true;
            layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
            layoutControlGroup5.Location = new Point(0, 185);
            layoutControlGroup5.Location = new Point(0, 237);
            layoutControlGroup5.Name = "layoutControlGroup5";
            layoutControlGroup5.Size = new Size(669, 259);
            layoutControlGroup5.Size = new Size(764, 334);
            layoutControlGroup5.Text = "说明";
            // 
            // layoutControlItem5
@@ -360,7 +377,7 @@
            layoutControlItem5.Control = textEditDescription;
            layoutControlItem5.Location = new Point(0, 0);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(645, 214);
            layoutControlItem5.Size = new Size(738, 276);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem5.TextSize = new Size(0, 0);
@@ -370,38 +387,38 @@
            // layoutControlItem2
            // 
            layoutControlItem2.Control = textEditNo;
            layoutControlItem2.Location = new Point(334, 0);
            layoutControlItem2.Location = new Point(381, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(335, 24);
            layoutControlItem2.Size = new Size(383, 30);
            layoutControlItem2.Text = "编号:";
            layoutControlItem2.TextSize = new Size(52, 14);
            layoutControlItem2.TextSize = new Size(65, 18);
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = textEditCatalog;
            layoutControlItem7.Location = new Point(0, 24);
            layoutControlItem7.Location = new Point(0, 30);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(334, 24);
            layoutControlItem7.Size = new Size(381, 30);
            layoutControlItem7.Text = "分类:";
            layoutControlItem7.TextSize = new Size(52, 14);
            layoutControlItem7.TextSize = new Size(65, 18);
            // 
            // layoutControlItem9
            // 
            layoutControlItem9.Control = gridControl1;
            layoutControlItem9.Location = new Point(0, 48);
            layoutControlItem9.Location = new Point(0, 60);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(669, 137);
            layoutControlItem9.Size = new Size(764, 177);
            layoutControlItem9.TextSize = new Size(0, 0);
            layoutControlItem9.TextVisible = false;
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = textEditEquipmentCount;
            layoutControlItem3.Location = new Point(334, 24);
            layoutControlItem3.Control = textEditUseCount;
            layoutControlItem3.Location = new Point(381, 30);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(335, 24);
            layoutControlItem3.Text = "设备数量:";
            layoutControlItem3.TextSize = new Size(52, 14);
            layoutControlItem3.Size = new Size(383, 30);
            layoutControlItem3.Text = "使用数量:";
            layoutControlItem3.TextSize = new Size(65, 18);
            // 
            // dxErrorProvider1
            // 
@@ -475,46 +492,47 @@
            // 
            // EditAssetsPackageMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleDimensions = new SizeF(8F, 18F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(681, 482);
            ClientSize = new Size(778, 620);
            Controls.Add(layoutControl1);
            Margin = new Padding(3, 4, 3, 4);
            Name = "EditAssetsPackageMainDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "编辑成套设备";
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)pumpAccountViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditDescription.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditNo.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditCatalog.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditEquipmentCount.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem15).EndInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)pumpAccountViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1).EndInit();
            ((ISupportInitialize)repositoryItemTreeListLookUpEdit1TreeList).EndInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((ISupportInitialize)textEditName.Properties).EndInit();
            ((ISupportInitialize)textEditDescription.Properties).EndInit();
            ((ISupportInitialize)textEditNo.Properties).EndInit();
            ((ISupportInitialize)textEditCatalog.Properties).EndInit();
            ((ISupportInitialize)textEditUseCount.Properties).EndInit();
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlGroup5).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)layoutControlItem9).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)layoutControlItem13).EndInit();
            ((ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem15).EndInit();
            ((ISupportInitialize)imageComboBoxEdit2.Properties).EndInit();
            ((ISupportInitialize)tabbedControlGroup2).EndInit();
            ((ISupportInitialize)layoutControlGroup3).EndInit();
            ((ISupportInitialize)layoutControlGroup4).EndInit();
            ((ISupportInitialize)layoutControlItem27).EndInit();
            ResumeLayout(false);
        }

@@ -561,7 +579,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn colUserCount;
        private DevExpress.XtraGrid.Columns.GridColumn ColDelete;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.TextEdit textEditEquipmentCount;
        private DevExpress.XtraEditors.TextEdit textEditUseCount;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs

@@ -25,12 +25,13 @@
            _allBindingList = new List<PumpAccountViewModel>();
            if (pumpList != null)
            {
                var nameCountGroups = pumpList
              .GroupBy(item => item.PumpMainID)
              .Select(group => new { Name = group.Key, Count = group.Count() });
                foreach (var group in nameCountGroups)
                /*                var nameCountGroups = pumpList
                              .GroupBy(item => item.PumpMainID)
                              .Select(group => new { Name = group.Key, Count = group.Count() });
                */
                foreach (var group in pumpList)
                {
                    _allBindingList.Add(new PumpAccountViewModel(group.Name, group.Count));
                    _allBindingList.Add(new PumpAccountViewModel(group.PumpMainID));
                }
            }
            this.pumpAccountViewModelBindingSource.DataSource = _allBindingList;
@@ -44,7 +45,7 @@
            this.textEditCatalog.EditValue = _EquipmentVmo.CatalogID;
            this.textEditName.Text = _EquipmentVmo.Name;
            this.textEditNo.Text = _EquipmentVmo.NO;
            this.textEditEquipmentCount.Text = _EquipmentVmo.PumpTotal.ToString();
            this.textEditUseCount.Text = _EquipmentVmo.PumpTotal.ToString();
            this.textEditDescription.Text = _EquipmentVmo.Description;
        }

@@ -71,10 +72,19 @@
                this.dxErrorProvider1.SetError(this.textEditName, "必填项");
                return false;
            }
            if (string.IsNullOrEmpty(textEditEquipmentCount.Text.Trim()))
            if (string.IsNullOrEmpty(textEditUseCount.Text.Trim()))
            {
                this.dxErrorProvider1.SetError(this.textEditEquipmentCount, "必填项");
                this.dxErrorProvider1.SetError(this.textEditUseCount, "必填项");
                return false;
            }
            if (_allBindingList != null)
            {
                int.TryParse(textEditUseCount.Text, out int UseCount);
                if (UseCount < _allBindingList.Count)
                {
                    TipFormHelper.ShowError("使用数量大于泵数量");
                    return false;
                }
            }

            return true;
@@ -88,7 +98,7 @@
            _EquipmentVmo.Description = textEditDescription.Text.Trim();
            _EquipmentVmo.Name = textEditName.Text.Trim();
            _EquipmentVmo.NO = textEditNo.Text.Trim();
            if (int.TryParse(this.textEditEquipmentCount.Text, out int equipmentCount))
            if (int.TryParse(this.textEditUseCount.Text, out int equipmentCount))
            {
                _EquipmentVmo.PumpUseCount = equipmentCount;
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.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
@@ -121,7 +121,7 @@
    <value>333, 17</value>
  </metadata>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions2.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PumpAccountViewModel.cs

@@ -11,16 +11,14 @@
            this.PumpID = rhs.PumpMainID;
        }

        public PumpAccountViewModel(long PumpID, int Count)
        public PumpAccountViewModel(long PumpID)
        {
            this.PumpID = PumpID;
            this.UserCount = Count;
        }
         }

        public long ID { get; set; }

        public long PumpID { get; set; }

        public int UserCount { get; set; }
    }
     }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/PackageManageMainPage.cs

@@ -69,6 +69,7 @@
            dlg.SetBindingData(series.ID);
            dlg.ReloadDataEvent += async (rhs, allMappingList) =>
            {
                rhs.PumpTotal = allMappingList.Count;
                var id = await _bll.Insert(rhs);
                if (id > 0)
                {
@@ -79,10 +80,7 @@
                        var model = new Vmo.AssetsPackagePumpMappingVmo();
                        model.PumpMainID = item.PumpID;
                        model.EquipmentMainID = id;
                        for (int i = 0; i < item.UserCount; i++)
                        {
                            await _mappingBll.Insert(model);
                        }
                        await _mappingBll.Insert(model);
                    }
                    for (int i = 0; i < _allBindingList.Count; i++)
                    {
@@ -116,6 +114,7 @@
            dlg.SetBindingData(Equipment);
            dlg.ReloadDataEvent += async (rhs, allMappingList) =>
           {
               rhs.PumpTotal = allMappingList.Count;
               if (await _bll.Update(rhs))
               {
                   vm.Reset(rhs);
@@ -126,11 +125,9 @@
                       var model = new Vmo.AssetsPackagePumpMappingVmo();
                       model.PumpMainID = item.PumpID;
                       model.EquipmentMainID = vm.ID;
                       for (int i = 0; i < item.UserCount; i++)
                       {
                           await _mappingBll.Insert(model);
                       }
                       await _mappingBll.Insert(model);
                   }
                   GridView1_FocusedRowChanged(null, null);

                   return true;
               }

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

@@ -44,6 +44,7 @@
            treeListLookUpEdit1.Dock = DockStyle.Fill;
            treeListLookUpEdit1.EditValue = "选择";
            treeListLookUpEdit1.Location = new Point(0, 0);
            treeListLookUpEdit1.Margin = new Padding(4, 4, 4, 4);
            treeListLookUpEdit1.Name = "treeListLookUpEdit1";
            treeListLookUpEdit1.Properties.AllowFocused = false;
            treeListLookUpEdit1.Properties.Appearance.Options.UseTextOptions = true;
@@ -52,23 +53,28 @@
            treeListLookUpEdit1.Properties.DisplayMember = "Name";
            treeListLookUpEdit1.Properties.TreeList = treeListLookUpEdit1TreeList;
            treeListLookUpEdit1.Properties.ValueMember = "ID";
            treeListLookUpEdit1.Size = new Size(215, 20);
            treeListLookUpEdit1.Size = new Size(269, 24);
            treeListLookUpEdit1.TabIndex = 0;
            // 
            // treeListLookUpEdit1TreeList
            // 
            treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName });
            treeListLookUpEdit1TreeList.HorzScrollStep = 4;
            treeListLookUpEdit1TreeList.Location = new Point(0, 0);
            treeListLookUpEdit1TreeList.MinWidth = 25;
            treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
            treeListLookUpEdit1TreeList.RootValue = "0";
            treeListLookUpEdit1TreeList.Size = new Size(400, 200);
            treeListLookUpEdit1TreeList.TabIndex = 0;
            treeListLookUpEdit1TreeList.TreeLevelWidth = 22;
            // 
            // colName
            // 
            colName.Caption = "名称";
            colName.FieldName = "Name";
            colName.MinWidth = 25;
            colName.Name = "colName";
            colName.Width = 94;
            // 
            // svgImageTree
            // 
@@ -76,11 +82,12 @@
            // 
            // SelectCorprationListCtrl
            // 
            AutoScaleDimensions = new SizeF(96F, 96F);
            AutoScaleDimensions = new SizeF(120F, 120F);
            AutoScaleMode = AutoScaleMode.Dpi;
            Controls.Add(treeListLookUpEdit1);
            Margin = new Padding(4, 4, 4, 4);
            Name = "SelectCorprationListCtrl";
            Size = new Size(215, 46);
            Size = new Size(269, 58);
            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
            ((System.ComponentModel.ISupportInitialize)svgImageTree).EndInit();

 WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/info/BuildPlaceInfoCtrl.cs

@@ -7,8 +7,7 @@
            InitializeComponent();
        }


        private PlaceBuildParasInfoVmo _model = null; 
        private PlaceBuildParasInfoVmo _model = null;

        public void Set(string info)
        {
@@ -26,8 +25,8 @@
        }

        public bool Verify()
        {  
            this.dxErrorProvider1.ClearErrors(); 
        {
            this.dxErrorProvider1.ClearErrors();
            return true;
        }

@@ -39,8 +38,9 @@
            }

            _model.CompletionTime = txtCompletionTime.Text;
            _model.Developer = txtDeveloper.Text; 
            _model.PropertyType = cbPropertyType.SelectedIndex;
            _model.Developer = txtDeveloper.Text;
            if (cbPropertyType.EditValue != null)
                _model.PropertyType = (ePropertyType)cbPropertyType.EditValue;

            if (string.IsNullOrEmpty(this.txtAreaSquare.Text) || !double.TryParse(this.txtAreaSquare.Text, out double areaSquare))
            {
@@ -53,7 +53,7 @@

            if (string.IsNullOrEmpty(this.textGreeningRate.Text) || !double.TryParse(this.textGreeningRate.Text, out double greeningRate))
            {
                _model.GreeningRate =  null;
                _model.GreeningRate = null;
            }
            else
            {
@@ -62,13 +62,12 @@

            if (string.IsNullOrEmpty(this.txtPlotRatio.Text) || !double.TryParse(this.txtPlotRatio.Text, out double plotRatio))
            {
                _model.PlotRatio =  null;
                _model.PlotRatio = null;
            }
            else
            {
                _model.PlotRatio = plotRatio;
            }


            if (string.IsNullOrEmpty(this.txtProperTyYears.Text) || !int.TryParse(this.txtProperTyYears.Text, out int properTyYears))
            {
@@ -90,9 +89,5 @@

            return _model.ToJson();
        }


        
         
    }
}

 WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.designer.cs

@@ -35,12 +35,12 @@
        private void InitializeComponent()
        {
            components = new Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(EditWaterWEDlg));
            SerializableAppearanceObject serializableAppearanceObject5 = new SerializableAppearanceObject();
            SerializableAppearanceObject serializableAppearanceObject6 = new SerializableAppearanceObject();
            SerializableAppearanceObject serializableAppearanceObject7 = new SerializableAppearanceObject();
            SerializableAppearanceObject serializableAppearanceObject8 = new SerializableAppearanceObject();
            SerializableAppearanceObject serializableAppearanceObject1 = new SerializableAppearanceObject();
            SerializableAppearanceObject serializableAppearanceObject2 = new SerializableAppearanceObject();
            SerializableAppearanceObject serializableAppearanceObject3 = new SerializableAppearanceObject();
            SerializableAppearanceObject serializableAppearanceObject4 = new SerializableAppearanceObject();
            dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            itemViewModelBindingSource = new BindingSource(components);
@@ -104,12 +104,12 @@
            // 
            gridControl1.DataSource = itemViewModelBindingSource;
            gridControl1.EmbeddedNavigator.Margin = new Padding(3, 5, 3, 5);
            gridControl1.Location = new Point(13, 46);
            gridControl1.Location = new Point(12, 40);
            gridControl1.MainView = gridView1;
            gridControl1.Margin = new Padding(3, 4, 3, 4);
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemTreeListLookUpEdit1, repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(742, 409);
            gridControl1.Size = new Size(744, 421);
            gridControl1.TabIndex = 6;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -231,9 +231,9 @@
            // repositoryItemButtonEdit1
            // 
            repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
            editorButtonImageOptions2.SvgImageSize = new Size(25, 25);
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, ToolTipAnchor.Default) });
            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
            editorButtonImageOptions1.SvgImageSize = new Size(25, 25);
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, ToolTipAnchor.Default) });
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
@@ -241,10 +241,10 @@
            // 
            btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnOk.Appearance.Options.UseBackColor = true;
            btnOk.Location = new Point(552, 461);
            btnOk.Location = new Point(552, 465);
            btnOk.Margin = new Padding(3, 4, 3, 4);
            btnOk.Name = "btnOk";
            btnOk.Size = new Size(105, 27);
            btnOk.Size = new Size(106, 27);
            btnOk.StyleController = dataLayoutControl1;
            btnOk.TabIndex = 7;
            btnOk.Text = "确定";
@@ -255,7 +255,7 @@
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.DialogResult = DialogResult.Cancel;
            btnCancel.Location = new Point(661, 461);
            btnCancel.Location = new Point(662, 465);
            btnCancel.Margin = new Padding(3, 4, 3, 4);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(94, 27);
@@ -265,10 +265,10 @@
            // 
            // textEditName
            // 
            textEditName.Location = new Point(100, 16);
            textEditName.Location = new Point(97, 12);
            textEditName.Margin = new Padding(3, 4, 3, 4);
            textEditName.Name = "textEditName";
            textEditName.Size = new Size(655, 24);
            textEditName.Size = new Size(659, 24);
            textEditName.StyleController = dataLayoutControl1;
            textEditName.TabIndex = 10;
            // 
@@ -290,32 +290,32 @@
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, emptySpaceItem1, layoutControlItem4, layoutControlItem3 });
            layoutControlGroup1.Location = new Point(0, 0);
            layoutControlGroup1.Name = "autoGeneratedGroup0";
            layoutControlGroup1.Size = new Size(746, 478);
            layoutControlGroup1.Size = new Size(748, 484);
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = btnCancel;
            layoutControlItem1.Location = new Point(648, 445);
            layoutControlItem1.Location = new Point(650, 453);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(98, 33);
            layoutControlItem1.Size = new Size(98, 31);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = btnOk;
            layoutControlItem2.Location = new Point(539, 445);
            layoutControlItem2.Location = new Point(540, 453);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(109, 33);
            layoutControlItem2.Size = new Size(110, 31);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 445);
            emptySpaceItem1.Location = new Point(0, 453);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(539, 33);
            emptySpaceItem1.Size = new Size(540, 31);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem4
@@ -324,16 +324,16 @@
            layoutControlItem4.Control = textEditName;
            layoutControlItem4.Location = new Point(0, 0);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(746, 30);
            layoutControlItem4.Size = new Size(748, 28);
            layoutControlItem4.Text = "<color=red>*</color>器具名称:";
            layoutControlItem4.TextSize = new Size(73, 18);
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = gridControl1;
            layoutControlItem3.Location = new Point(0, 30);
            layoutControlItem3.Location = new Point(0, 28);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(746, 415);
            layoutControlItem3.Size = new Size(748, 425);
            layoutControlItem3.TextSize = new Size(0, 0);
            layoutControlItem3.TextVisible = false;
            // 
@@ -350,7 +350,7 @@
            Margin = new Padding(3, 4, 3, 4);
            Name = "EditWaterWEDlg";
            StartPosition = FormStartPosition.CenterParent;
            Text = "编辑";
            Text = "设置";
            ((ISupportInitialize)dataLayoutControl1).EndInit();
            dataLayoutControl1.ResumeLayout(false);
            ((ISupportInitialize)gridControl1).EndInit();

 WinFrmUI/PBS.WinFrmUI.WE/WaterWE/EditWaterWEDlg.resx

@@ -121,7 +121,7 @@
    <value>172, 17</value>
  </metadata>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="editorButtonImageOptions2.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

 WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.cs

@@ -1,4 +1,5 @@
using Yw.WinFrmUI;
using DevExpress.Utils.Extensions;
using Yw.WinFrmUI;

namespace PBS.WinFrmUI.WE
{
@@ -179,7 +180,22 @@
            if (await _bll.DeleteByID(vm.ID))
            {
                MessageBoxHelper.ShowSuccess("删除成功!");
                _allBindingList.Remove(vm);

                // å…ˆè®°å½•è¦åˆ é™¤çš„元素
                var itemsToRemove = new List<ItemViewModel>();
                foreach (var item in _allBindingList)
                {
                    if (item.Name == vm.Name)
                    {
                        itemsToRemove.Add(item);
                    }
                }

                // ç»Ÿä¸€åˆ é™¤è®°å½•çš„元素
                foreach (var item in itemsToRemove)
                {
                    _allBindingList.Remove(item);
                }
                this.itemViewModelBindingSource.ResetBindings(false);
            }
            else MessageBoxHelper.ShowError($"删除失败!");

 WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.Designer.cs

@@ -164,8 +164,7 @@
        }

        #endregion
        private HomePbsProjectPropertyCtrl homeXhsProjectPropertyCtrl1;
        private DevExpress.Utils.SvgImageCollection svgImg32;
         private DevExpress.Utils.SvgImageCollection svgImg32;
        private DevExpress.XtraEditors.SidePanel sidePanelBottom;
        private DevExpress.XtraBars.Docking.DockManager dockManager1;
        private DevExpress.XtraBars.Docking.DockPanel dockPanelRight;

 WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs

@@ -14,6 +14,7 @@
            this.PageTitle.SvgImageSize = new Size(24, 24);
            //   this.xhsProjectHomeTitleCtrl1.JumpEvent += XhsProjectHomeTitleCtrl1_JumpEvent;
            this.mapViewProjectListContainer2.LoadCompletedEvent += MapViewProjectListContainer1_LoadCompletedEvent;
            this.homeXhsProjectPropertyCtrl2.SelectProjectEvent += homeXhsProjectTreeListCtrl1_SelectProjectEvent;
        }

        private List<FacilityVmo> _allProjectList = null;//所有项目列表
@@ -44,17 +45,21 @@
        //地图加载完成
        private async void MapViewProjectListContainer1_LoadCompletedEvent()
        {
           await this.mapViewProjectListContainer2.SetProjectList(_allProjectList);
            await this.mapViewProjectListContainer2.SetProjectList(_allProjectList);
            //  this.homeXhsProjectTreeListCtrl1.SetBindingData(_allProjectList);
        }

        /*      //选择项目事件
              private async void homeXhsProjectTreeListCtrl1_SelectProjectEvent(XhsProjectVmo obj)
              {
                  await this.mapViewProjectListContainer1.SelectProject(obj.ID);
                  var vm = new HomeXhsProjectPropertyViewModel(obj);
                  this.homeXhsProjectPropertyCtrl1.SelectedObject = vm;
              }*/
        //选择项目事件
        private async void homeXhsProjectTreeListCtrl1_SelectProjectEvent(FacilityVmo obj)
        {
            await this.mapViewProjectListContainer2.SelectProject(obj.ID);
            var vm = new HomePbsProjectPropertyViewModel(obj);
            this.homeXhsProjectPropertyCtrl2.SelectedObject = vm;

            /*   await this.mapViewProjectListContainer1.SelectProject(obj.ID);
              var vm = new HomeXhsProjectPropertyViewModel(obj);
              this.homeXhsProjectPropertyCtrl1.SelectedObject = vm;*/
        }

        /*    //导入完成事件
            private void homeXhsProjectTreeListCtrl1_ImportProjectCompletedEvent(ImportXhsProjectViewModel obj)

 WinFrmUI/PBS.WinFrmUI/00-home/01-prjlist/XtraUserControl1.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
namespace _00_home._01_prjlist
{
    partial class XtraUserControl1
    {
        /// <summary> 
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary> 
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Component Designer generated code

        /// <summary> 
        /// Required method for Designer support - do not modify 
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
        }

        #endregion
    }
}

 WinFrmUI/PBS.WinFrmUI/00-home/01-prjlist/XtraUserControl1.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using 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;

namespace _00_home._01_prjlist
{
    public partial class XtraUserControl1 : DevExpress.XtraEditors.XtraUserControl
    {
        public XtraUserControl1()
        {
            InitializeComponent();
        }
    }
}

 WinFrmUI/PBS.WinFrmUI/00-home/01-prjlist/XtraUserControl1.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!-- 
    Microsoft ResX Schema 
    
    Version 2.0
    
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 
    associated with the data types.
    
    Example:
    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
                
    There are any number of "resheader" rows that contain simple 
    name/value pairs.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 
    mimetype set.
    
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
    
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
    
    mimetype: application/x-microsoft.net.object.binary.base64
    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
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>

 WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs

@@ -22,7 +22,9 @@
            this.Description = project.Description;
            var marker = Yw.Model.Map.Marker.ToModel(mapInfo.Position);
            this.Point = marker?.Point;
            //this.Customer = project.Customer;
            this.Address = marker?.Address;
             //this.Customer = project.Customer;
            
        }

        /// <summary>
@@ -54,5 +56,9 @@
        /// åæ ‡
        /// </summary>
        public Yw.Model.Map.Point Point { get; set; }
        /// <summary>
        /// è¯¦ç»†ä½ç½®
        /// </summary>
        public string Address { get; set; }
    }
}

 WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.Designer.cs

@@ -59,7 +59,6 @@

        #endregion

        private Yw.WinFrmUI.WebViewControl webViewControl1;
        private WebViewControl webViewControl2;
         private Yw.WinFrmUI.WebViewControl webViewControl2;
    }
}

 WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs

@@ -68,7 +68,7 @@
        {
            if (long.TryParse(obj, out long PrjID))
            {
                JumpDirectEvent.Invoke(PrjID);
                //JumpDirectEvent.Invoke(PrjID);
            }
        }


 WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.Designer.cs

@@ -54,10 +54,11 @@
            layoutProperty = new DevExpress.XtraLayout.LayoutControlItem();
            splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
            layoutDescription = new DevExpress.XtraLayout.LayoutControlItem();
            bindingSource1 = new BindingSource(components);
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)barManager1).BeginInit();
@@ -66,6 +67,7 @@
            ((ISupportInitialize)layoutProperty).BeginInit();
            ((ISupportInitialize)splitterItem1).BeginInit();
            ((ISupportInitialize)layoutDescription).BeginInit();
            ((ISupportInitialize)bindingSource1).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)gridControl1).BeginInit();
@@ -168,6 +170,7 @@
            toolTipItem4.Text = "跳转";
            superToolTip4.Items.Add(toolTipItem4);
            barBtnDirect.SuperTip = superToolTip4;
            barBtnDirect.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            barBtnDirect.ItemClick += barBtnDirect_ItemClick;
            // 
            // barDockControlTop
@@ -301,16 +304,7 @@
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridControl1
            // 
            gridControl1.Location = new Point(2, 334);
            gridControl1.MainView = gridView1;
            gridControl1.MenuManager = barManager1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(293, 329);
            gridControl1.TabIndex = 6;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            gridView1.FocusedRowChanged += gridView1_FocusedRowChanged;
            // 
            // gridColumn1
            // 
@@ -321,6 +315,16 @@
            gridColumn1.Visible = true;
            gridColumn1.VisibleIndex = 0;
            gridColumn1.Width = 94;
            // 
            // gridControl1
            // 
            gridControl1.Location = new Point(2, 334);
            gridControl1.MainView = gridView1;
            gridControl1.MenuManager = barManager1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(293, 329);
            gridControl1.TabIndex = 6;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // HomePbsProjectPropertyCtrl
            // 
@@ -342,6 +346,7 @@
            ((ISupportInitialize)layoutProperty).EndInit();
            ((ISupportInitialize)splitterItem1).EndInit();
            ((ISupportInitialize)layoutDescription).EndInit();
            ((ISupportInitialize)bindingSource1).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)gridControl1).EndInit();
@@ -368,9 +373,10 @@
        private DevExpress.XtraBars.BarButtonItem barBtnExpandAll;
        private DevExpress.XtraBars.BarButtonItem barBtnCollpseAll;
        private DevExpress.XtraBars.BarButtonItem barBtnDirect;
        private BindingSource bindingSource1;
        private DevExpress.XtraGrid.GridControl gridControl1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
    }
}

 WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.cs

@@ -1,8 +1,10 @@
using DevExpress.XtraBars;
using DevExpress.Mvvm.POCO;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Repository;
using DevExpress.XtraLayout.Utils;
using DevExpress.XtraVerticalGrid.Events;
using PBS.Vmo;
using System.ComponentModel;
using Yw.Untity;
using Yw.WinFrmUI;
@@ -17,12 +19,29 @@
            //this.layoutControl1.SetupLayoutControl();
            SetDescriptionVisible(false);//默认设置属性描述面板不显示
            this.barBtnDirect.Visibility = BarItemVisibility.Never;
            this.Load += HomePbsProjectPropertyCtrl_Load;
            this.gridView1.SetNormalView(30);
        }

        private async void HomePbsProjectPropertyCtrl_Load(object sender, EventArgs e)
        {
            _allBindingList = await new BLL.Facility().GetAll();
            this.bindingSource1.DataSource = _allBindingList;
            this.gridControl1.DataSource = bindingSource1;
            this.bindingSource1.ResetBindings(false);
        }

        /// <summary>
        /// è·³è½¬äº‹ä»¶
        /// </summary>
        public event Action<long> JumpDirectEvent;

        private List<FacilityVmo> _allBindingList;

        /// <summary>
        /// é€‰æ‹©é¡¹ç›®äº‹ä»¶
        /// </summary>
        public event Action<FacilityVmo> SelectProjectEvent;

        /// <summary>
        /// ç»‘定对象
@@ -250,5 +269,14 @@
               }
               JumpDirectEvent?.Invoke(this.SelectedObject.Project.ID);*/
        }

        private void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
            if (vm != null)
            {
                SelectProjectEvent.Invoke(vm);
            }
        }
    }
}

 WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.resx

@@ -232,4 +232,7 @@
        NnY2TDI4LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>175, 17</value>
  </metadata>
</root>

 WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyViewModel.cs

@@ -18,62 +18,120 @@
        /// <summary>
        ///
        /// </summary>
   /*     public HomeXhsProjectPropertyViewModel(XhsProjectVmo rhs)
        public HomePbsProjectPropertyViewModel(Vmo.FacilityVmo rhs)
        {
            this.NO = rhs.NO;
            this.Name = rhs.Name;
            this.Address = rhs.Address;
            this.Customer = rhs.Customer;
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.TagName = rhs.TagName;
            this.Description = rhs.Description;

            this.WaterSupply = rhs.WaterSupply;
            this.SupplyMode = rhs.SupplyMode;
            this.Floor = rhs.Floor;
            this.FloorHeight = rhs.FloorHeight;
            this.Households = rhs.Households;
            this.MaxWaterDemand = rhs.MaxWaterDemand;
            this.ConstantPressure = rhs.ConstantPressure;
            this.TerminalPressure = rhs.TerminalPressure;
            this.MaxHeight = rhs.MaxHeight;
            this.Project = rhs;
        }*/

        /// <summary>
        /// ç¼–号
        /// </summary>
        [DisplayName("项目编号")]
        [Category("基本信息")]
        [PropertyOrder(1)]
        [Browsable(true)]
        public string NO { get; set; }
        }

        /// <summary>
        /// åç§°
        /// </summary>
        [DisplayName("项目名称")]
        [Category("基本信息")]
        [PropertyOrder(2)]
        [PropertyOrder(0)]
        [Browsable(true)]
        public string Name { get; set; }

        /// <summary>
        /// è¯¦ç»†åœ°å€
        /// </summary>
        [DisplayName("详细地址")]
        /// ä¾›æ°´å•å…ƒ
        ///</summary>
        [DisplayName("供水单元")]
        [Category("基本信息")]
        [PropertyOrder(6)]
        [MultiText]
        [PropertyOrder(2)]
        [Browsable(true)]
        public string Address { get; set; }
        public eWaterSupply WaterSupply { get; set; }

        /// <summary>
        /// å®¢æˆ·åç§°
        /// </summary>
        [DisplayName("客户名称")]
        /// ä¾›æ°´æ¨¡å¼
        ///</summary>
        [DisplayName("供水模式")]
        [Category("基本信息")]
        [PropertyOrder(3)]
        [Browsable(true)]
        public eSupplyMode SupplyMode { get; set; }

        /// <summary>
        /// æ¥¼å±‚
        ///</summary>
        [DisplayName("楼层")]
        [Category("基本信息")]
        [PropertyOrder(3)]
        [Browsable(true)]
        public int Floor { get; set; }

        /// <summary>
        /// å±‚高
        ///</summary>
        [DisplayName("层高")]
        [Category("基本信息")]
        [PropertyOrder(4)]
        [Browsable(true)]
        public double? FloorHeight { get; set; }

        /// <summary>
        /// æˆ·æ•°
        ///</summary>
        [DisplayName("户数")]
        [Category("基本信息")]
        [PropertyOrder(5)]
        [Browsable(true)]
        public int? Households { get; set; }

        /// <summary>
        /// æœ€å¤§éœ€æ°´é‡
        ///</summary>
        [DisplayName("最大需水量")]
        [Category("基本信息")]
        [PropertyOrder(6)]
        [Browsable(true)]
        public double? MaxWaterDemand { get; set; }

        /// <summary>
        /// æ’定压力
        ///</summary>
        [DisplayName("恒定压力")]
        [Category("基本信息")]
        [PropertyOrder(7)]
        [Browsable(true)]
        public string Customer { get; set; }
        public double? ConstantPressure { get; set; }

        /// <summary>
        /// æœ«ç«¯åŽ‹åŠ›
        ///</summary>
        [DisplayName("末端压力")]
        [Category("基本信息")]
        [PropertyOrder(8)]
        [Browsable(true)]
        public double? TerminalPressure { get; set; }

        /// <summary>
        /// æœ€é«˜æ¥¼å±‚标高
        /// </summary>
        [DisplayName("最高楼层标高")]
        [Category("基本信息")]
        [PropertyOrder(9)]
        [Browsable(true)]
        public double MaxHeight { get; set; }

        /// <summary>
        /// æ ‡ç­¾
        /// </summary>
        [DisplayName("标签")]
        [Category("基本信息")]
        [PropertyOrder(8)]
        [PropertyOrder(10)]
        [Browsable(true)]
        public string Flags { get; set; }

@@ -82,7 +140,7 @@
        /// </summary>
        [DisplayName("标志")]
        [Category("基本信息")]
        [PropertyOrder(9)]
        [PropertyOrder(11)]
        [Browsable(true)]
        public string TagName { get; set; }

@@ -91,7 +149,7 @@
        /// </summary>
        [DisplayName("说明")]
        [Category("基本信息")]
        [PropertyOrder(10)]
        [PropertyOrder(12)]
        [Browsable(true)]
        [MultiText]
        public string Description { get; set; }
@@ -99,7 +157,7 @@
        /// <summary>
        ///
        /// </summary>
    /*    [Browsable(false)]
     public XhsProjectVmo Project { get; set; }*/
        [Browsable(false)]
        public Vmo.FacilityVmo Project { get; set; }
    }
}

 WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.Designer.cs

@@ -30,7 +30,6 @@
        {
            components = new System.ComponentModel.Container();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            cbPropertyType = new DevExpress.XtraEditors.ComboBoxEdit();
            txtCompletionTime = new DevExpress.XtraEditors.TextEdit();
            txtProperTyYears = new DevExpress.XtraEditors.TextEdit();
            txtTotalHouseHolds = new DevExpress.XtraEditors.TextEdit();
@@ -49,9 +48,9 @@
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            cbPropertyType = new DevExpress.XtraEditors.ImageComboBoxEdit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtCompletionTime.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtProperTyYears.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtTotalHouseHolds.Properties).BeginInit();
@@ -70,11 +69,11 @@
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(cbPropertyType);
            layoutControl1.Controls.Add(txtCompletionTime);
            layoutControl1.Controls.Add(txtProperTyYears);
            layoutControl1.Controls.Add(txtTotalHouseHolds);
@@ -82,6 +81,7 @@
            layoutControl1.Controls.Add(txtPlotRatio);
            layoutControl1.Controls.Add(txtDeveloper);
            layoutControl1.Controls.Add(textGreeningRate);
            layoutControl1.Controls.Add(cbPropertyType);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Margin = new Padding(3, 4, 3, 4);
@@ -91,20 +91,6 @@
            layoutControl1.Size = new Size(925, 321);
            layoutControl1.TabIndex = 91;
            layoutControl1.Text = "layoutControl1";
            // 
            // cbPropertyType
            // 
            cbPropertyType.Location = new Point(121, 52);
            cbPropertyType.Margin = new Padding(2, 3, 2, 3);
            cbPropertyType.MinimumSize = new Size(0, 36);
            cbPropertyType.Name = "cbPropertyType";
            cbPropertyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            cbPropertyType.Properties.Items.AddRange(new object[] { "公寓住宅" });
            cbPropertyType.Properties.NullText = "请选择";
            cbPropertyType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            cbPropertyType.Size = new Size(339, 36);
            cbPropertyType.StyleController = layoutControl1;
            cbPropertyType.TabIndex = 6;
            // 
            // txtCompletionTime
            // 
@@ -292,6 +278,19 @@
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // cbPropertyType
            // 
            cbPropertyType.Location = new Point(121, 52);
            cbPropertyType.Margin = new Padding(2, 3, 2, 3);
            cbPropertyType.MinimumSize = new Size(0, 36);
            cbPropertyType.Name = "cbPropertyType";
            cbPropertyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            cbPropertyType.Properties.NullText = "请选择";
            cbPropertyType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            cbPropertyType.Size = new Size(339, 36);
            cbPropertyType.StyleController = layoutControl1;
            cbPropertyType.TabIndex = 6;
            // 
            // BuildWizardForm
            // 
            AutoScaleDimensions = new SizeF(8F, 18F);
@@ -300,9 +299,8 @@
            Margin = new Padding(2, 3, 2, 3);
            Name = "BuildWizardForm";
            Size = new Size(925, 321);
             ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtCompletionTime.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtProperTyYears.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtTotalHouseHolds.Properties).EndInit();
@@ -321,12 +319,12 @@
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).EndInit();
            ResumeLayout(false);
        }

        #endregion
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraEditors.ComboBoxEdit cbPropertyType;
        private DevExpress.XtraEditors.TextEdit txtCompletionTime;
        private DevExpress.XtraEditors.TextEdit txtProperTyYears;
        private DevExpress.XtraEditors.TextEdit txtTotalHouseHolds;
@@ -345,5 +343,6 @@
        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
        private DevExpress.XtraEditors.TextEdit textGreeningRate;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.ImageComboBoxEdit cbPropertyType;
    }
}

 WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.cs

@@ -7,6 +7,12 @@
        public BuildWizardForm()
        {
            InitializeComponent();
            this.Load += BuildWizardForm_Load;
        }

        private void BuildWizardForm_Load(object sender, EventArgs e)
        {
            this.cbPropertyType.Properties.AddEnum(typeof(ePropertyType));
        }

        //基础验证
@@ -23,99 +29,80 @@
            {
                return null;
            }
            /*var m = new PlaceBuildParasInfo()
            {
                //  Address = txtAddress.Text,
                //   Area = (long?)this.cbArea.EditValue,
                //    City = (long?)this.cbCity.EditValue,
                //    Dist = (long?)this.cbDist.EditValue,
                AreaSquare = string.IsNullOrEmpty(txtAreaSquare.Text) ? null : double.Parse(txtAreaSquare.Text),
                CompletionTime = txtCompletionTime.Text,
                Developer = txtDeveloper.Text,
                GreeningRate = string.IsNullOrEmpty(this.textGreeningRate.Text) ? null : double.Parse(textGreeningRate.Text),
                //  Name = txtName.Text,
                PlotRatio = string.IsNullOrEmpty(txtPlotRatio.Text) ? null : double.Parse(txtPlotRatio.Text),
                PropertyType = 1,
                ProperTyYears = string.IsNullOrEmpty(txtProperTyYears.Text) ? 0 : int.Parse(txtProperTyYears.Text),
                TotalHouseHolds = string.IsNullOrEmpty(txtTotalHouseHolds.Text) ? 0 : int.Parse(txtTotalHouseHolds.Text)
            };*/
            var m = new PlaceBuildParasInfoVmo();
            var model = new PlaceBuildParasInfoVmo();
            // å¤„理 AreaSquare
            if (string.IsNullOrEmpty(txtAreaSquare.Text) || !double.TryParse(txtAreaSquare.Text, out double areaSquare))
            {
                m.AreaSquare = null;
                model.AreaSquare = null;
            }
            else
            {
                m.AreaSquare = areaSquare;
                model.AreaSquare = areaSquare;
            }

            // å¤„理 CompletionTime
            m.CompletionTime = txtCompletionTime.Text;
            model.CompletionTime = txtCompletionTime.Text;

            // å¤„理 Developer
            m.Developer = txtDeveloper.Text;
            model.Developer = txtDeveloper.Text;

            // å¤„理 GreeningRate
            if (string.IsNullOrEmpty(textGreeningRate.Text) || !double.TryParse(textGreeningRate.Text, out double greeningRate))
            {
                m.GreeningRate = null;
                model.GreeningRate = null;
            }
            else
            {
                m.GreeningRate = greeningRate;
                model.GreeningRate = greeningRate;
            }

            // å¤„理 PlotRatio
            if (string.IsNullOrEmpty(txtPlotRatio.Text) || !double.TryParse(txtPlotRatio.Text, out double plotRatio))
            {
                m.PlotRatio = null;
                model.PlotRatio = null;
            }
            else
            {
                m.PlotRatio = plotRatio;
                model.PlotRatio = plotRatio;
            }

            // å¤„理 PropertyType
            m.PropertyType = 1;

            // å¤„理 ProperTyYears
            if (string.IsNullOrEmpty(txtProperTyYears.Text) || !int.TryParse(txtProperTyYears.Text, out int properTyYears))
            {
                m.ProperTyYears = 0;
                model.ProperTyYears = 0;
            }
            else
            {
                m.ProperTyYears = properTyYears;
                model.ProperTyYears = properTyYears;
            }

            // å¤„理 TotalHouseHolds
            if (string.IsNullOrEmpty(txtTotalHouseHolds.Text) || !int.TryParse(txtTotalHouseHolds.Text, out int totalHouseHolds))
            {
                m.TotalHouseHolds = 0;
                model.TotalHouseHolds = 0;
            }
            else
            {
                m.TotalHouseHolds = totalHouseHolds;
                model.TotalHouseHolds = totalHouseHolds;
            }
            return m;
            if (this.cbPropertyType.EditValue != null)
            {
                model.PropertyType = (ePropertyType)this.cbPropertyType.EditValue;
            }
            return model;
        }

        public void SetData(PlaceBuildParasInfoVmo model)
        {
            if (model == null) return;
            //   txtAddress.Text = model.Address;
            txtAreaSquare.Text = model.AreaSquare.ToString();
            txtCompletionTime.Text = model.CompletionTime.ToString();
            txtDeveloper.Text = model.Developer.ToString();
            textGreeningRate.Text = model.GreeningRate.ToString();
            //    txtName.Text = model.Name.ToString();
            txtPlotRatio.Text = model.PlotRatio.ToString();
            txtProperTyYears.Text = model.ProperTyYears.ToString();
            txtTotalHouseHolds.Text = model.TotalHouseHolds.ToString();
            //        cbArea.EditValue = model.Area;
            //       cbCity.EditValue = model.City;
            //      cbDist.EditValue = model.Dist;
            this.cbPropertyType.EditValue = model.PropertyType;
        }
    }
}

 WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs

@@ -288,7 +288,7 @@
            barBtnUpdateUseStatus.Id = 24;
            barBtnUpdateUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateUseStatus.ImageOptions.SvgImage");
            barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
            barBtnUpdateUseStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            barBtnUpdateUseStatus.ItemClick += barBtnUpdateUseStatus_ItemClick;
            // 
            // barCekSearch
            // 

 WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.cs

@@ -1,6 +1,7 @@
using DevExpress.DataProcessing.InMemoryDataProcessor;
using DevExpress.Utils.DragDrop;
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
using Yw;
using Yw.WinFrmUI;

@@ -401,5 +402,28 @@
            this.placeViewModelBindingSource.ResetBindings(false);
            this.gridView1.FocusedRowHandle = nextHandle;
        }

        private void barBtnUpdateUseStatus_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
            if (vm == null)
            {
                return;
            }
            var dlg = new SetUseStatusDlg();
            dlg.SetBindingData((Yw.Model.eUseStatus)vm.UseStatus);
            dlg.ReloadDataEvent += async (status) =>
            {
                var bol = await BLLFactory<PBS.BLL.Place>.Instance.UpdateUseStatus(vm.ID, status);
                if (bol)
                {
                    vm.UseStatus = (Yw.Vmo.eUseStatus)(int)status;
                    this.gridView1.RefreshRow(this.gridView1.FocusedRowHandle);
                    return true;
                }
                return false;
            };
            dlg.ShowDialog();
        }
    }
}

 WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs

@@ -45,6 +45,7 @@
            textEditWaterModel = new DevExpress.XtraEditors.ImageComboBoxEdit();
            imageComboBoxConnectionType = new DevExpress.XtraEditors.ImageComboBoxEdit();
            textEditConnectionAddress = new DevExpress.XtraEditors.TextEdit();
            textEditMaxHeight = new DevExpress.XtraEditors.TextEdit();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            txtFlooritem = new DevExpress.XtraLayout.LayoutControlItem();
            comboBoxCompletePlantitem = new DevExpress.XtraLayout.LayoutControlItem();
@@ -59,9 +60,8 @@
            txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            textEditMaxHeight = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).BeginInit();
            FacilitiesWizardFormlayoutControl1ConvertedLayout.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)txtEditPlace.Properties).BeginInit();
@@ -78,6 +78,7 @@
            ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxConnectionType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditConnectionAddress.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtFlooritem).BeginInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).BeginInit();
@@ -92,9 +93,8 @@
            ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            SuspendLayout();
            // 
            // FacilitiesWizardFormlayoutControl1ConvertedLayout
@@ -279,6 +279,15 @@
            textEditConnectionAddress.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
            textEditConnectionAddress.TabIndex = 13;
            // 
            // textEditMaxHeight
            // 
            textEditMaxHeight.Location = new Point(592, 252);
            textEditMaxHeight.MinimumSize = new Size(0, 36);
            textEditMaxHeight.Name = "textEditMaxHeight";
            textEditMaxHeight.Size = new Size(285, 36);
            textEditMaxHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
            textEditMaxHeight.TabIndex = 14;
            // 
            // layoutControlGroup1
            // 
            layoutControlGroup1.AppearanceItemCaption.Options.UseTextOptions = true;
@@ -426,19 +435,6 @@
            layoutControlItem9.Text = "连接地址:";
            layoutControlItem9.TextSize = new Size(134, 18);
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // textEditMaxHeight
            // 
            textEditMaxHeight.Location = new Point(592, 252);
            textEditMaxHeight.MinimumSize = new Size(0, 36);
            textEditMaxHeight.Name = "textEditMaxHeight";
            textEditMaxHeight.Size = new Size(285, 36);
            textEditMaxHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
            textEditMaxHeight.TabIndex = 14;
            // 
            // layoutControlItem10
            // 
            layoutControlItem10.Control = textEditMaxHeight;
@@ -447,6 +443,10 @@
            layoutControlItem10.Size = new Size(435, 136);
            layoutControlItem10.Text = "最高楼层标高:";
            layoutControlItem10.TextSize = new Size(134, 18);
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // FacilitiesCtrl
            // 
@@ -472,6 +472,7 @@
            ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxConnectionType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditConnectionAddress.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtFlooritem).EndInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).EndInit();
@@ -486,9 +487,8 @@
            ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ResumeLayout(false);
        }


 WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs

@@ -82,6 +82,7 @@
            var list = await new PBS.BLL.Place().GetAll();
            this.treeListLookUpEdit1TreeList.DataSource = list;
            this.imageComboBoxConnectionType.Properties.AddEnum(typeof(PBS.eConnectionType));
            this.imageComboBoxConnectionType.SelectedIndex = 1;
        }

        public void SetData(Vmo.FacilityVmo model)

 WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs

@@ -340,7 +340,7 @@
            barBtnUpdateUseStatus.Id = 24;
            barBtnUpdateUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateUseStatus.ImageOptions.SvgImage");
            barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
            barBtnUpdateUseStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            barBtnUpdateUseStatus.ItemClick += barBtnUpdateUseStatus_ItemClick;
            // 
            // barCekSearch
            // 

 WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.cs

@@ -1,5 +1,7 @@
using DevExpress.Utils.DragDrop;
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
using Yw;
using Yw.WinFrmUI;

namespace PBS.WinFrmUI
@@ -309,5 +311,28 @@
            this.facilityViewModelBindingSource.ResetBindings(false);
            this.gridView1.FocusedRowHandle = nextHandle;
        }

        private void barBtnUpdateUseStatus_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
            if (vm == null)
            {
                return;
            }
            var dlg = new SetUseStatusDlg();
            dlg.SetBindingData((Yw.Model.eUseStatus)vm.UseStatus);
            dlg.ReloadDataEvent += async (status) =>
            {
                var bol = await new PBS.BLL.Facility().UpdateUseStatus(vm.ID, status);
                if (bol)
                {
                    vm.UseStatus = (Yw.Vmo.eUseStatus)(int)status;
                    this.gridView1.RefreshRow(this.gridView1.FocusedRowHandle);
                    return true;
                }
                return false;
            };
            dlg.ShowDialog();
        }
    }
}

 WinFrmUI/PBS.WinFrmUI/03-elecPrice/ElecPriceMgr.Designer.cs

@@ -204,8 +204,6 @@
            colDescription.FieldName = "Description";
            colDescription.MinWidth = 25;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 5;
            colDescription.Width = 94;
            // 
            // gridColumn1

 WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj

@@ -80,6 +80,7 @@
    <ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
    <ProjectReference Include="..\..\BLL\PBS.BLL\PBS.BLL.csproj" />
    <ProjectReference Include="..\..\BLL\Yw.BLL.Division.Core\Yw.BLL.Division.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\PBS.WinFrmUI.WE\PBS.WinFrmUI.WE.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />

 WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user

@@ -5,6 +5,9 @@
    <Compile Update="00-home\00-core\HomePbsProjectPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="00-home\01-prjlist\XtraUserControl1.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="00-home\02-map\MapViewProjectListContainer.cs">
      <SubType>UserControl</SubType>
    </Compile>

 WinFrmUI/PBS.WinFrmUI/map/gaode/html/ViewProjectList.html

@@ -128,7 +128,7 @@
                });
                labelMarker.objInfo = x;
                labelMarker.on("click", function (e) {
                    //setSelectProjectStyle(e.target);
                    setSelectProjectStyle(e.target);
                    //_callBackObj.SelectProject(e.target.objInfo.Id);
                });
                labelMarkers.push(labelMarker);
@@ -164,11 +164,11 @@
            );
            info.push(overlay.objInfo.Name);
            info.push("</label>");
            info.push("<p class='input-item'>编号：");
            info.push(overlay.objInfo.NO);
            info.push("</p>");
            info.push("<p class='input-item'>客户名称：");
            info.push(overlay.objInfo.Customer);
            /*  info.push("<p class='input-item'>编号：");
              info.push(overlay.objInfo.NO);
              info.push("</p>");*/
            info.push("<p class='input-item'>详细地址：");
            info.push(overlay.objInfo.Address);
            info.push("</p>");
            info.push("</div>");
            infoWindow = new AMap.InfoWindow({