1、单位数据清理合并功能；

2、单位新增编辑功能调整，补充英文名称等；
3、建筑企业单位资质字典；

SGGL/FineUIPro.Web/SysManage/UnitEdit.aspx.cs

@@ -40,6 +40,7 @@ namespace FineUIPro.Web.SysManage
                     {
                         this.txtUnitCode.Text = unit.UnitCode;
                         this.txtUnitName.Text = unit.UnitName;
+                        this.txtUnitEnName.Text = unit.UnitEnName;
                         if (!string.IsNullOrEmpty(unit.UnitTypeId))
                         {
                             this.ddlUnitTypeId.SelectedValue = unit.UnitTypeId;
@@ -85,7 +86,12 @@ namespace FineUIPro.Web.SysManage
         {
             if (BLL.UnitService.IsExitUnitByUnitName(this.UnitId, this.txtUnitName.Text.Trim()))
             {
-                Alert.ShowInTop("单位名称已存在！", MessageBoxIcon.Warning);
+                Alert.ShowInTop("单位中文名称已存在！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (BLL.UnitService.IsExitUnitByUnitEnName(this.UnitId, this.txtUnitEnName.Text.Trim()))
+            {
+                Alert.ShowInTop("单位英文名称已存在！", MessageBoxIcon.Warning);
                 return;
             }
             if (BLL.UnitService.IsExitUnitByUnitName(this.UnitId, this.txtUnitCode.Text.Trim()))
@@ -93,19 +99,22 @@ namespace FineUIPro.Web.SysManage
                 Alert.ShowInTop("单位代码已存在！", MessageBoxIcon.Warning);
                 return;
             }
+            //单位类型下拉框
+            string unitTypeId = this.ddlUnitTypeId.SelectedValue;
+            if (unitTypeId == null || this.ddlUnitTypeId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择单位类型！", MessageBoxIcon.Warning);
+                return;
+            }
 
             Model.Base_Unit unit = new Model.Base_Unit
             {
                 UnitCode = this.txtUnitCode.Text.Trim(),
-                UnitName = this.txtUnitName.Text.Trim()
-
+                UnitName = this.txtUnitName.Text.Trim(),
+                UnitEnName = this.txtUnitEnName.Text.TrimStart().TrimEnd()
             };
             unit.IsBranch = Convert.ToBoolean(this.rblIsBranch.SelectedValue);
-            ////单位类型下拉框
-            if (this.ddlUnitTypeId.SelectedValue != BLL.Const._Null)
-            {
-                unit.UnitTypeId = this.ddlUnitTypeId.SelectedValue;
-            }
+            unit.UnitTypeId = this.ddlUnitTypeId.SelectedValue;
             unit.Corporate = this.txtCorporate.Text.Trim();
             unit.Address = this.txtAddress.Text.Trim();
             unit.Telephone = this.txtTelephone.Text.Trim();