From e411302bca8857e102443a5250c82b9580ef07a3 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 10:49:48 +0800
Subject: [PATCH] 修改成套设备增加逻辑

---
 WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs |  449 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 238 insertions(+), 211 deletions(-)

diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
index 90a3a1b..45a2af2 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
@@ -30,86 +30,89 @@
         {
             components = new System.ComponentModel.Container();
             FacilitiesWizardFormlayoutControl1ConvertedLayout = new DevExpress.XtraLayout.LayoutControl();
+            txtEditPlace = new DevExpress.XtraEditors.TreeListLookUpEdit();
+            treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
+            treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
             txtFloorHeight = new DevExpress.XtraEditors.TextEdit();
             txtFloor = new DevExpress.XtraEditors.TextEdit();
             txtName = new DevExpress.XtraEditors.TextEdit();
             txtWaterPressure = new DevExpress.XtraEditors.TextEdit();
             txtMaxWaterDemand = new DevExpress.XtraEditors.TextEdit();
-            textEdit11 = new DevExpress.XtraEditors.TextEdit();
-            textEditCount = new DevExpress.XtraEditors.TextEdit();
-            textEditFacAmount = new DevExpress.XtraEditors.TextEdit();
             comboBoxWaterSupply = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            comboBoxCompletePlant = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            comboBoxPackages = new DevExpress.XtraEditors.ImageComboBoxEdit();
             txtFloorHouseHolds = new DevExpress.XtraEditors.TextEdit();
             txtConstantP = new DevExpress.XtraEditors.TextEdit();
-            textEdit2 = new DevExpress.XtraEditors.TextEdit();
             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();
-            txtFloorHeightitem = new DevExpress.XtraLayout.LayoutControlItem();
             txtFlooritem = new DevExpress.XtraLayout.LayoutControlItem();
             comboBoxCompletePlantitem = new DevExpress.XtraLayout.LayoutControlItem();
             txtNameitem = new DevExpress.XtraLayout.LayoutControlItem();
             comboBoxWaterSupplyitem = new DevExpress.XtraLayout.LayoutControlItem();
-            txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             txtWaterHeightitem = new DevExpress.XtraLayout.LayoutControlItem();
+            txtFloorHeightitem = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            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();
+            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtFloor.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtName.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtWaterPressure.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtMaxWaterDemand.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit11.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEditCount.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEditFacAmount.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)comboBoxWaterSupply.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlant.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)comboBoxPackages.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).BeginInit();
             ((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)txtFloorHeightitem).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtFlooritem).BeginInit();
             ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtNameitem).BeginInit();
             ((System.ComponentModel.ISupportInitialize)comboBoxWaterSupplyitem).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
             ((System.ComponentModel.ISupportInitialize)txtWaterHeightitem).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtFloorHeightitem).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
             ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
             SuspendLayout();
             // 
             // FacilitiesWizardFormlayoutControl1ConvertedLayout
             // 
+            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtEditPlace);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHeight);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloor);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtName);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtWaterPressure);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtMaxWaterDemand);
-            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEdit11);
-            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditCount);
-            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditFacAmount);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(comboBoxWaterSupply);
-            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(comboBoxCompletePlant);
+            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(comboBoxPackages);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHouseHolds);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtConstantP);
-            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEdit2);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditWaterModel);
+            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(imageComboBoxConnectionType);
+            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditConnectionAddress);
+            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditMaxHeight);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Dock = DockStyle.Fill;
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Location = new Point(0, 0);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Margin = new Padding(3, 4, 3, 4);
@@ -119,27 +122,59 @@
             FacilitiesWizardFormlayoutControl1ConvertedLayout.Size = new Size(889, 396);
             FacilitiesWizardFormlayoutControl1ConvertedLayout.TabIndex = 146;
             // 
+            // txtEditPlace
+            // 
+            txtEditPlace.Location = new Point(592, 12);
+            txtEditPlace.Margin = new Padding(3, 4, 3, 4);
+            txtEditPlace.MinimumSize = new Size(0, 36);
+            txtEditPlace.Name = "txtEditPlace";
+            txtEditPlace.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtEditPlace.Properties.DisplayMember = "Name";
+            txtEditPlace.Properties.NullText = "";
+            txtEditPlace.Properties.TreeList = treeListLookUpEdit1TreeList;
+            txtEditPlace.Properties.ValueMember = "ID";
+            txtEditPlace.Size = new Size(285, 36);
+            txtEditPlace.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
+            txtEditPlace.TabIndex = 2;
+            // 
+            // treeListLookUpEdit1TreeList
+            // 
+            treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
+            treeListLookUpEdit1TreeList.Location = new Point(45, 98);
+            treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
+            treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
+            treeListLookUpEdit1TreeList.Size = new Size(400, 200);
+            treeListLookUpEdit1TreeList.TabIndex = 0;
+            // 
+            // treeListColumn1
+            // 
+            treeListColumn1.Caption = "鍚嶇О";
+            treeListColumn1.FieldName = "Name";
+            treeListColumn1.Name = "treeListColumn1";
+            treeListColumn1.Visible = true;
+            treeListColumn1.VisibleIndex = 0;
+            // 
             // txtFloorHeight
             // 
-            txtFloorHeight.Location = new Point(158, 160);
+            txtFloorHeight.Location = new Point(592, 132);
             txtFloorHeight.Margin = new Padding(2, 3, 2, 3);
             txtFloorHeight.MinimumSize = new Size(0, 36);
             txtFloorHeight.Name = "txtFloorHeight";
             txtFloorHeight.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            txtFloorHeight.Size = new Size(244, 36);
+            txtFloorHeight.Size = new Size(285, 36);
             txtFloorHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            txtFloorHeight.TabIndex = 9;
+            txtFloorHeight.TabIndex = 8;
             // 
             // txtFloor
             // 
-            txtFloor.Location = new Point(158, 120);
+            txtFloor.Location = new Point(158, 92);
             txtFloor.Margin = new Padding(2, 3, 2, 3);
             txtFloor.MinimumSize = new Size(0, 36);
             txtFloor.Name = "txtFloor";
             txtFloor.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            txtFloor.Size = new Size(244, 36);
+            txtFloor.Size = new Size(284, 36);
             txtFloor.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            txtFloor.TabIndex = 7;
+            txtFloor.TabIndex = 5;
             // 
             // txtName
             // 
@@ -147,118 +182,111 @@
             txtName.Margin = new Padding(2, 3, 2, 3);
             txtName.MinimumSize = new Size(0, 36);
             txtName.Name = "txtName";
-            txtName.Size = new Size(244, 36);
+            txtName.Size = new Size(284, 36);
             txtName.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
             txtName.TabIndex = 0;
             // 
             // txtWaterPressure
             // 
-            txtWaterPressure.Location = new Point(552, 12);
+            txtWaterPressure.Location = new Point(158, 172);
             txtWaterPressure.Margin = new Padding(2, 3, 2, 3);
             txtWaterPressure.MinimumSize = new Size(0, 36);
             txtWaterPressure.Name = "txtWaterPressure";
-            txtWaterPressure.Size = new Size(325, 36);
+            txtWaterPressure.Size = new Size(284, 36);
             txtWaterPressure.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            txtWaterPressure.TabIndex = 2;
+            txtWaterPressure.TabIndex = 9;
             // 
             // txtMaxWaterDemand
             // 
-            txtMaxWaterDemand.Location = new Point(552, 92);
+            txtMaxWaterDemand.Location = new Point(592, 92);
             txtMaxWaterDemand.Margin = new Padding(2, 3, 2, 3);
             txtMaxWaterDemand.MinimumSize = new Size(0, 36);
             txtMaxWaterDemand.Name = "txtMaxWaterDemand";
             txtMaxWaterDemand.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            txtMaxWaterDemand.Size = new Size(325, 36);
+            txtMaxWaterDemand.Size = new Size(285, 36);
             txtMaxWaterDemand.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
             txtMaxWaterDemand.TabIndex = 6;
             // 
-            // textEdit11
-            // 
-            textEdit11.Location = new Point(158, 52);
-            textEdit11.Margin = new Padding(3, 4, 3, 4);
-            textEdit11.MinimumSize = new Size(0, 36);
-            textEdit11.Name = "textEdit11";
-            textEdit11.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            textEdit11.Size = new Size(244, 36);
-            textEdit11.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            textEdit11.TabIndex = 3;
-            // 
-            // textEditCount
-            // 
-            textEditCount.Location = new Point(158, 240);
-            textEditCount.Margin = new Padding(3, 4, 3, 4);
-            textEditCount.MinimumSize = new Size(0, 36);
-            textEditCount.Name = "textEditCount";
-            textEditCount.Size = new Size(244, 36);
-            textEditCount.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            textEditCount.TabIndex = 12;
-            // 
-            // textEditFacAmount
-            // 
-            textEditFacAmount.Location = new Point(552, 132);
-            textEditFacAmount.Margin = new Padding(3, 4, 3, 4);
-            textEditFacAmount.MinimumSize = new Size(0, 36);
-            textEditFacAmount.Name = "textEditFacAmount";
-            textEditFacAmount.Size = new Size(325, 36);
-            textEditFacAmount.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            textEditFacAmount.TabIndex = 8;
-            // 
             // comboBoxWaterSupply
             // 
-            comboBoxWaterSupply.Location = new Point(552, 52);
+            comboBoxWaterSupply.Location = new Point(158, 52);
             comboBoxWaterSupply.Margin = new Padding(2, 3, 2, 3);
             comboBoxWaterSupply.MinimumSize = new Size(0, 36);
             comboBoxWaterSupply.Name = "comboBoxWaterSupply";
             comboBoxWaterSupply.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
             comboBoxWaterSupply.Properties.NullText = "璇烽�夋嫨";
-            comboBoxWaterSupply.Size = new Size(325, 36);
+            comboBoxWaterSupply.Size = new Size(284, 36);
             comboBoxWaterSupply.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            comboBoxWaterSupply.TabIndex = 4;
+            comboBoxWaterSupply.TabIndex = 3;
             // 
-            // comboBoxCompletePlant
+            // comboBoxPackages
             // 
-            comboBoxCompletePlant.Location = new Point(158, 200);
-            comboBoxCompletePlant.Margin = new Padding(2, 3, 2, 3);
-            comboBoxCompletePlant.MinimumSize = new Size(0, 36);
-            comboBoxCompletePlant.Name = "comboBoxCompletePlant";
-            comboBoxCompletePlant.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
-            comboBoxCompletePlant.Properties.NullText = "璇烽�夋嫨";
-            comboBoxCompletePlant.Size = new Size(244, 36);
-            comboBoxCompletePlant.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            comboBoxCompletePlant.TabIndex = 10;
+            comboBoxPackages.Location = new Point(158, 132);
+            comboBoxPackages.Margin = new Padding(2, 3, 2, 3);
+            comboBoxPackages.MinimumSize = new Size(0, 36);
+            comboBoxPackages.Name = "comboBoxPackages";
+            comboBoxPackages.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            comboBoxPackages.Properties.NullText = "璇烽�夋嫨";
+            comboBoxPackages.Size = new Size(284, 36);
+            comboBoxPackages.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
+            comboBoxPackages.TabIndex = 7;
             // 
             // txtFloorHouseHolds
             // 
-            txtFloorHouseHolds.Location = new Point(158, 92);
+            txtFloorHouseHolds.Location = new Point(592, 52);
+            txtFloorHouseHolds.Margin = new Padding(2, 3, 2, 3);
+            txtFloorHouseHolds.MinimumSize = new Size(0, 36);
             txtFloorHouseHolds.Name = "txtFloorHouseHolds";
-            txtFloorHouseHolds.Size = new Size(244, 24);
+            txtFloorHouseHolds.Size = new Size(285, 36);
             txtFloorHouseHolds.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            txtFloorHouseHolds.TabIndex = 5;
+            txtFloorHouseHolds.TabIndex = 4;
             // 
             // txtConstantP
             // 
-            txtConstantP.Location = new Point(552, 200);
+            txtConstantP.Location = new Point(158, 212);
+            txtConstantP.MinimumSize = new Size(0, 36);
             txtConstantP.Name = "txtConstantP";
-            txtConstantP.Size = new Size(325, 24);
+            txtConstantP.Size = new Size(284, 36);
             txtConstantP.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
             txtConstantP.TabIndex = 11;
             // 
-            // textEdit2
-            // 
-            textEdit2.Location = new Point(552, 240);
-            textEdit2.Name = "textEdit2";
-            textEdit2.Size = new Size(325, 24);
-            textEdit2.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            textEdit2.TabIndex = 13;
-            // 
             // textEditWaterModel
             // 
-            textEditWaterModel.Location = new Point(158, 280);
+            textEditWaterModel.Location = new Point(592, 172);
+            textEditWaterModel.MinimumSize = new Size(0, 36);
             textEditWaterModel.Name = "textEditWaterModel";
             textEditWaterModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
-            textEditWaterModel.Size = new Size(244, 24);
+            textEditWaterModel.Size = new Size(285, 36);
             textEditWaterModel.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
-            textEditWaterModel.TabIndex = 14;
+            textEditWaterModel.TabIndex = 10;
+            // 
+            // imageComboBoxConnectionType
+            // 
+            imageComboBoxConnectionType.Location = new Point(592, 212);
+            imageComboBoxConnectionType.MinimumSize = new Size(0, 36);
+            imageComboBoxConnectionType.Name = "imageComboBoxConnectionType";
+            imageComboBoxConnectionType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            imageComboBoxConnectionType.Size = new Size(285, 36);
+            imageComboBoxConnectionType.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
+            imageComboBoxConnectionType.TabIndex = 12;
+            // 
+            // textEditConnectionAddress
+            // 
+            textEditConnectionAddress.Location = new Point(158, 252);
+            textEditConnectionAddress.MinimumSize = new Size(0, 36);
+            textEditConnectionAddress.Name = "textEditConnectionAddress";
+            textEditConnectionAddress.Size = new Size(284, 36);
+            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
             // 
@@ -266,29 +294,18 @@
             layoutControlGroup1.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
             layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             layoutControlGroup1.GroupBordersVisible = false;
-            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFloorHeightitem, txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterPressureitem, layoutControlItem3, layoutControlItem1, layoutControlItem6, layoutControlItem7, layoutControlItem8, layoutControlItem5, txtWaterHeightitem, layoutControlItem2 });
+            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem, layoutControlItem4, layoutControlItem9, layoutControlItem10 });
             layoutControlGroup1.Name = "Root";
             layoutControlGroup1.Size = new Size(889, 396);
             layoutControlGroup1.TextVisible = false;
-            // 
-            // txtFloorHeightitem
-            // 
-            txtFloorHeightitem.AllowHtmlStringInCaption = true;
-            txtFloorHeightitem.Control = txtFloorHeight;
-            txtFloorHeightitem.Location = new Point(0, 148);
-            txtFloorHeightitem.Name = "txtFloorHeightitem";
-            txtFloorHeightitem.Size = new Size(394, 40);
-            txtFloorHeightitem.Text = "<color=red>*</color>灞傞珮(m)锛�";
-            txtFloorHeightitem.TextLocation = DevExpress.Utils.Locations.Left;
-            txtFloorHeightitem.TextSize = new Size(134, 18);
             // 
             // txtFlooritem
             // 
             txtFlooritem.AllowHtmlStringInCaption = true;
             txtFlooritem.Control = txtFloor;
-            txtFlooritem.Location = new Point(0, 108);
+            txtFlooritem.Location = new Point(0, 80);
             txtFlooritem.Name = "txtFlooritem";
-            txtFlooritem.Size = new Size(394, 40);
+            txtFlooritem.Size = new Size(434, 40);
             txtFlooritem.Text = "<color=red>*</color>妤煎眰锛�";
             txtFlooritem.TextLocation = DevExpress.Utils.Locations.Left;
             txtFlooritem.TextSize = new Size(134, 18);
@@ -296,10 +313,10 @@
             // comboBoxCompletePlantitem
             // 
             comboBoxCompletePlantitem.AllowHtmlStringInCaption = true;
-            comboBoxCompletePlantitem.Control = comboBoxCompletePlant;
-            comboBoxCompletePlantitem.Location = new Point(0, 188);
+            comboBoxCompletePlantitem.Control = comboBoxPackages;
+            comboBoxCompletePlantitem.Location = new Point(0, 120);
             comboBoxCompletePlantitem.Name = "comboBoxCompletePlantitem";
-            comboBoxCompletePlantitem.Size = new Size(394, 40);
+            comboBoxCompletePlantitem.Size = new Size(434, 40);
             comboBoxCompletePlantitem.Text = "<color=red>*</color>鎴愬璁惧锛�";
             comboBoxCompletePlantitem.TextLocation = DevExpress.Utils.Locations.Left;
             comboBoxCompletePlantitem.TextSize = new Size(134, 18);
@@ -310,7 +327,7 @@
             txtNameitem.Control = txtName;
             txtNameitem.Location = new Point(0, 0);
             txtNameitem.Name = "txtNameitem";
-            txtNameitem.Size = new Size(394, 40);
+            txtNameitem.Size = new Size(434, 40);
             txtNameitem.StartNewLine = true;
             txtNameitem.Text = "<color=red>*</color>璁炬柦鍚嶇О锛�";
             txtNameitem.TextLocation = DevExpress.Utils.Locations.Left;
@@ -320,111 +337,112 @@
             // 
             comboBoxWaterSupplyitem.AllowHtmlStringInCaption = true;
             comboBoxWaterSupplyitem.Control = comboBoxWaterSupply;
-            comboBoxWaterSupplyitem.Location = new Point(394, 40);
+            comboBoxWaterSupplyitem.Location = new Point(0, 40);
             comboBoxWaterSupplyitem.Name = "comboBoxWaterSupplyitem";
-            comboBoxWaterSupplyitem.Size = new Size(475, 40);
+            comboBoxWaterSupplyitem.Size = new Size(434, 40);
             comboBoxWaterSupplyitem.Text = "<color=red>*</color>渚涙按鍗曞厓锛�";
             comboBoxWaterSupplyitem.TextLocation = DevExpress.Utils.Locations.Left;
             comboBoxWaterSupplyitem.TextSize = new Size(134, 18);
             // 
-            // txtWaterPressureitem
+            // txtWaterHeightitem
             // 
-            txtWaterPressureitem.AllowHtmlStringInCaption = true;
-            txtWaterPressureitem.Control = txtWaterPressure;
-            txtWaterPressureitem.Location = new Point(394, 0);
-            txtWaterPressureitem.Name = "txtWaterPressureitem";
-            txtWaterPressureitem.Size = new Size(475, 40);
-            txtWaterPressureitem.Text = "<color=red>*</color>鏈鍘嬪姏(m):";
-            txtWaterPressureitem.TextLocation = DevExpress.Utils.Locations.Left;
-            txtWaterPressureitem.TextSize = new Size(134, 18);
+            txtWaterHeightitem.AllowHtmlStringInCaption = true;
+            txtWaterHeightitem.Control = txtMaxWaterDemand;
+            txtWaterHeightitem.Location = new Point(434, 80);
+            txtWaterHeightitem.Name = "txtWaterHeightitem";
+            txtWaterHeightitem.Size = new Size(435, 40);
+            txtWaterHeightitem.Text = "<color=red>*</color>鏈�澶х敤姘撮噺(m鲁/h):";
+            txtWaterHeightitem.TextLocation = DevExpress.Utils.Locations.Left;
+            txtWaterHeightitem.TextSize = new Size(134, 18);
             // 
-            // layoutControlItem3
+            // txtFloorHeightitem
             // 
-            layoutControlItem3.AllowHtmlStringInCaption = true;
-            layoutControlItem3.Control = textEdit11;
-            layoutControlItem3.ControlAlignment = ContentAlignment.TopLeft;
-            layoutControlItem3.CustomizationFormText = "鏈�楂樻ゼ灞傛爣楂�:";
-            layoutControlItem3.Location = new Point(0, 40);
-            layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Size = new Size(394, 40);
-            layoutControlItem3.Text = "<color=red>*</color>鏈�楂樻ゼ灞傛爣楂�(m):";
-            layoutControlItem3.TextSize = new Size(134, 18);
-            // 
-            // layoutControlItem1
-            // 
-            layoutControlItem1.AllowHtmlStringInCaption = true;
-            layoutControlItem1.Control = textEditCount;
-            layoutControlItem1.ControlAlignment = ContentAlignment.TopLeft;
-            layoutControlItem1.CustomizationFormText = "鐢ㄦ埛鏁帮細";
-            layoutControlItem1.Location = new Point(0, 228);
-            layoutControlItem1.Name = "layoutControlItem1";
-            layoutControlItem1.Size = new Size(394, 40);
-            layoutControlItem1.Text = "鐢ㄦ埛鏁帮細";
-            layoutControlItem1.TextSize = new Size(134, 18);
-            layoutControlItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            txtFloorHeightitem.AllowHtmlStringInCaption = true;
+            txtFloorHeightitem.Control = txtFloorHeight;
+            txtFloorHeightitem.Location = new Point(434, 120);
+            txtFloorHeightitem.Name = "txtFloorHeightitem";
+            txtFloorHeightitem.Size = new Size(435, 40);
+            txtFloorHeightitem.Text = "<color=red>*</color>灞傞珮(m)锛�";
+            txtFloorHeightitem.TextLocation = DevExpress.Utils.Locations.Left;
+            txtFloorHeightitem.TextSize = new Size(134, 18);
             // 
             // layoutControlItem6
             // 
             layoutControlItem6.AllowHtmlStringInCaption = true;
             layoutControlItem6.Control = txtConstantP;
-            layoutControlItem6.Location = new Point(394, 188);
+            layoutControlItem6.Location = new Point(0, 200);
             layoutControlItem6.Name = "layoutControlItem6";
-            layoutControlItem6.Size = new Size(475, 40);
+            layoutControlItem6.Size = new Size(434, 40);
             layoutControlItem6.Text = "<color=red>*</color>鎭掑畾鍘嬪姏:";
             layoutControlItem6.TextSize = new Size(134, 18);
-            // 
-            // layoutControlItem7
-            // 
-            layoutControlItem7.Control = textEditWaterModel;
-            layoutControlItem7.Location = new Point(0, 268);
-            layoutControlItem7.Name = "layoutControlItem7";
-            layoutControlItem7.Size = new Size(394, 108);
-            layoutControlItem7.Text = "渚涙按妯″紡:";
-            layoutControlItem7.TextSize = new Size(134, 18);
-            // 
-            // layoutControlItem8
-            // 
-            layoutControlItem8.Control = textEdit2;
-            layoutControlItem8.Location = new Point(394, 228);
-            layoutControlItem8.Name = "layoutControlItem8";
-            layoutControlItem8.Size = new Size(475, 148);
-            layoutControlItem8.Text = "鍏ユ埛绠¢暱:";
-            layoutControlItem8.TextSize = new Size(134, 18);
             // 
             // layoutControlItem5
             // 
             layoutControlItem5.AllowHtmlStringInCaption = true;
             layoutControlItem5.Control = txtFloorHouseHolds;
             layoutControlItem5.CustomizationFormText = "鎴锋暟锛�";
-            layoutControlItem5.Location = new Point(0, 80);
+            layoutControlItem5.Location = new Point(434, 40);
             layoutControlItem5.Name = "layoutControlItem5";
-            layoutControlItem5.Size = new Size(394, 28);
+            layoutControlItem5.Size = new Size(435, 40);
             layoutControlItem5.Text = "<color=red>*</color>鎴锋暟:";
             layoutControlItem5.TextSize = new Size(134, 18);
             // 
-            // txtWaterHeightitem
+            // layoutControlItem7
             // 
-            txtWaterHeightitem.AllowHtmlStringInCaption = true;
-            txtWaterHeightitem.Control = txtMaxWaterDemand;
-            txtWaterHeightitem.Location = new Point(394, 80);
-            txtWaterHeightitem.Name = "txtWaterHeightitem";
-            txtWaterHeightitem.Size = new Size(475, 40);
-            txtWaterHeightitem.Text = "<color=red>*</color>鏈�澶х敤姘撮噺(m鲁/h):";
-            txtWaterHeightitem.TextLocation = DevExpress.Utils.Locations.Left;
-            txtWaterHeightitem.TextSize = new Size(134, 18);
+            layoutControlItem7.Control = textEditWaterModel;
+            layoutControlItem7.Location = new Point(434, 160);
+            layoutControlItem7.Name = "layoutControlItem7";
+            layoutControlItem7.Size = new Size(435, 40);
+            layoutControlItem7.Text = "渚涙按妯″紡:";
+            layoutControlItem7.TextSize = new Size(134, 18);
             // 
             // layoutControlItem2
             // 
             layoutControlItem2.AllowHtmlStringInCaption = true;
-            layoutControlItem2.Control = textEditFacAmount;
-            layoutControlItem2.ControlAlignment = ContentAlignment.TopLeft;
-            layoutControlItem2.CustomizationFormText = "褰撻噺鍣ㄥ叿鏁伴噺锛�";
-            layoutControlItem2.Location = new Point(394, 120);
+            layoutControlItem2.Control = txtEditPlace;
+            layoutControlItem2.Location = new Point(434, 0);
             layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(475, 68);
-            layoutControlItem2.Text = "褰撻噺鍣ㄥ叿鏁伴噺锛�";
+            layoutControlItem2.Size = new Size(435, 40);
+            layoutControlItem2.Text = "<color=red>*</color>鍦烘墍:";
             layoutControlItem2.TextSize = new Size(134, 18);
-            layoutControlItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            // 
+            // txtWaterPressureitem
+            // 
+            txtWaterPressureitem.AllowHtmlStringInCaption = true;
+            txtWaterPressureitem.Control = txtWaterPressure;
+            txtWaterPressureitem.Location = new Point(0, 160);
+            txtWaterPressureitem.Name = "txtWaterPressureitem";
+            txtWaterPressureitem.Size = new Size(434, 40);
+            txtWaterPressureitem.Text = "<color=red>*</color>鏈鍘嬪姏(m):";
+            txtWaterPressureitem.TextLocation = DevExpress.Utils.Locations.Left;
+            txtWaterPressureitem.TextSize = new Size(134, 18);
+            // 
+            // layoutControlItem4
+            // 
+            layoutControlItem4.Control = imageComboBoxConnectionType;
+            layoutControlItem4.Location = new Point(434, 200);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Size = new Size(435, 40);
+            layoutControlItem4.Text = "杩炴帴绫诲瀷:";
+            layoutControlItem4.TextSize = new Size(134, 18);
+            // 
+            // layoutControlItem9
+            // 
+            layoutControlItem9.Control = textEditConnectionAddress;
+            layoutControlItem9.Location = new Point(0, 240);
+            layoutControlItem9.Name = "layoutControlItem9";
+            layoutControlItem9.Size = new Size(434, 136);
+            layoutControlItem9.Text = "杩炴帴鍦板潃:";
+            layoutControlItem9.TextSize = new Size(134, 18);
+            // 
+            // layoutControlItem10
+            // 
+            layoutControlItem10.Control = textEditMaxHeight;
+            layoutControlItem10.Location = new Point(434, 240);
+            layoutControlItem10.Name = "layoutControlItem10";
+            layoutControlItem10.Size = new Size(435, 136);
+            layoutControlItem10.Text = "鏈�楂樻ゼ灞傛爣楂�:";
+            layoutControlItem10.TextSize = new Size(134, 18);
             // 
             // dxErrorProvider1
             // 
@@ -438,37 +456,38 @@
             Margin = new Padding(2, 3, 2, 3);
             Name = "FacilitiesCtrl";
             Size = new Size(889, 396);
-             ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).EndInit();
+            ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).EndInit();
             FacilitiesWizardFormlayoutControl1ConvertedLayout.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)txtEditPlace.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtFloor.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtName.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtWaterPressure.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtMaxWaterDemand.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit11.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEditCount.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEditFacAmount.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)comboBoxWaterSupply.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlant.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)comboBoxPackages.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).EndInit();
             ((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)txtFloorHeightitem).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtFlooritem).EndInit();
             ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtNameitem).EndInit();
             ((System.ComponentModel.ISupportInitialize)comboBoxWaterSupplyitem).EndInit();
-            ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
             ((System.ComponentModel.ISupportInitialize)txtWaterHeightitem).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtFloorHeightitem).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
             ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
             ResumeLayout(false);
         }
@@ -492,12 +511,9 @@
         private DevExpress.XtraEditors.TextEdit textEdit11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         public DevExpress.XtraEditors.TextEdit textEditCount;
-        public DevExpress.XtraEditors.TextEdit textEditFacAmount;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraEditors.ImageComboBoxEdit comboBoxWaterSupply;
-        private DevExpress.XtraEditors.ImageComboBoxEdit comboBoxCompletePlant;
-        private DevExpress.XtraEditors.TextEdit txtFloorHouseHolds;
+        private DevExpress.XtraEditors.ImageComboBoxEdit comboBoxPackages;
         private DevExpress.XtraEditors.TextEdit txtConstantP;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
@@ -505,5 +521,16 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraEditors.ImageComboBoxEdit textEditWaterModel;
+        public DevExpress.XtraEditors.TextEdit txtFloorHouseHolds;
+        private DevExpress.XtraEditors.TreeListLookUpEdit txtEditPlace;
+        private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxConnectionType;
+        private DevExpress.XtraEditors.TextEdit textEditConnectionAddress;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraEditors.TextEdit textEditMaxHeight;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
     }
 }

--
Gitblit v1.9.3