diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 6f9c25b7..cafdf43e 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -194,6 +194,10 @@
///
public const string UnitId_SEDIN = "d72a27c9-4ba9-41c5-ab0b-c010409f20f2";
///
+ /// 集团公司单位id
+ ///
+ public const string UnitId_CNCEC = "722090d1-b5de-4c3c-a4f7-14f308161a3b";
+ ///
/// 赛鼎
///
public const string AppID_SEDIN = "wxee9d14366730ae44";
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index b5cfae88..a4bb89e0 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -473,23 +473,6 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
-
- ///
- /// 根据单位类型获取单位表下拉框
- ///
- /// 下拉框名字
- /// 是否显示请选择
- public static void InitUnitNameByProjectIdUnitTypeDropDownList(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease)
- {
- dropName.DataValueField = "UnitName";
- dropName.DataTextField = "UnitName";
- dropName.DataSource = BLL.UnitService.GetUnitByProjectIdUnitTypeList(projectId, unitType);
- dropName.DataBind();
- if (isShowPlease)
- {
- Funs.FineUIPleaseSelect(dropName);
- }
- }
#endregion
///
@@ -579,22 +562,6 @@ namespace BLL
}
}
- ///
- /// 单位表下拉框
- ///
- /// 下拉框名字
- /// 是否显示请选择
- public static void GetUnit(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
- {
- dropName.DataValueField = "UnitId";
- dropName.DataTextField = "UnitName";
- dropName.DataSource = GetUnitByProjectIdList(projectId);
- dropName.DataBind();
- if (isShowPlease)
- {
- Funs.FineUIPleaseSelect(dropName);
- }
- }
public static void GetALLUnit(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "UnitId";
@@ -657,6 +624,21 @@ namespace BLL
}
}
+ public static void InitSeDinAndCNCECUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+ {
+ dropName.Items.Clear();
+ dropName.DataValueField = "UnitId";
+ dropName.DataTextField = "UnitName";
+ dropName.DataSource = (from x in Funs.DB.Base_Unit
+ where x.UnitId==Const.UnitId_SEDIN || x.UnitId == Const.UnitId_CNCEC
+ select x).OrderByDescending(x => x.UnitCode).ToList();
+ dropName.DataBind();
+ if (isShowPlease)
+ {
+ Funs.FineUIPleaseSelect(dropName);
+ }
+ }
+
#region 根据多单位ID得到单位名称字符串
///
/// 根据多单位ID得到单位名称字符串
@@ -712,7 +694,7 @@ namespace BLL
///
///
///
- public static void InitUnitDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+ public static void InitMainOrSubUnitDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs
index 5977a5ef..44f4d020 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.CQMS.Check
if (!IsPostBack)
{
- UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, false);
+ UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, false);
var unitWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
var unitWorks = from x in unitWork
select
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs
index 6f1cc559..b9405ee7 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true);
+ UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
btnNew.OnClientClick = Window1.GetShowReference("EditSpotCheck.aspx") + "return false;";
GetButtonPower();
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs
index b5a077d3..ada00ed3 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true);
+ UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BindData();
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs
index f39f3a33..adf5b3a3 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true);
+ UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
GetButtonPower();
BindData();
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs
index 853e1253..1553fc35 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
+ UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpContactListType);
Funs.FineUIPleaseSelect(this.drpIsReply);
Funs.FineUIPleaseSelect(this.drpState);
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs
index 5627baab..07c05f33 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs
@@ -29,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
+ UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpContactListType);
Funs.FineUIPleaseSelect(this.drpIsReply);
UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs
index cdd0f662..3a0467fd 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
+ UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpIsReply);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BindGrid();
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs
index 00ceb9fd..464d54b1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("ConstructionTestEdit.aspx") + "return false;";
GetButtonPower();
BindGrid();
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs
index 19bed248..d4a68c88 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs
@@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
- BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.ConstructionTestTypeService.InitConstructionTestType(this.drpConstructionTestType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
ConstructionTestId = Request.Params["ConstructionTestId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs
index 7a4aaf3e..3e0b661e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs
@@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
- BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.ConstructionTestTypeService.InitConstructionTestType(this.drpConstructionTestType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
ConstructionTestId = Request.Params["ConstructionTestId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs
index 2cbf9f10..31819f0a 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("EquipmentEdit.aspx") + "return false;";
GetButtonPower();
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
index 83c4350b..2a2d661a 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string EquipmentId = Request.Params["EquipmentId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs
index a58c2797..d4840f86 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Material
{
this.ProjectId = this.CurrUser.LoginProjectId;
list = new List();
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
if (!string.IsNullOrEmpty(this.CurrUser.UnitId))
{
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs
index 9a406811..87597997 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string EquipmentId = Request.Params["EquipmentId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
index 704c59f7..3765d7d2 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Material
this.ProjectId = this.CurrUser.LoginProjectId;
//权限按钮方法
GetButtonPower();
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
Funs.FineUIPleaseSelect(this.drpState);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
index 738e1717..e7701c1b 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
@@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
InspectionId = Request.Params["InspectionId"];
this.HideOptions.Hidden = true;
this.rblIsAgree.Hidden = true;
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
index 8272adb5..46806684 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
@@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
InspectionId = Request.Params["InspectionId"];
if (!string.IsNullOrEmpty(InspectionId))
{
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs
index 3aa8649f..aef8dbd1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("MaterialEdit.aspx") + "return false;";
GetButtonPower();
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs
index 9ac662f8..63dc5523 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs
index ae8f9d23..33a61df3 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Material
{
this.ProjectId = this.CurrUser.LoginProjectId;
list = new List();
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
if (!string.IsNullOrEmpty(this.CurrUser.UnitId))
{
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs
index bcdc9b42..29955203 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("MaterialTestEdit.aspx") + "return false;";
GetButtonPower();
BindGrid();
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs
index 3224f62d..907f00d1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs
@@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
- BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.MaterialTypeService.InitMaterialType(this.drpMaterialType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
MaterialTestId = Request.Params["MaterialTestId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs
index 8c0aa513..dca1e1fe 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs
@@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
- BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.MaterialTypeService.InitMaterialType(this.drpMaterialType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
MaterialTestId = Request.Params["MaterialTestId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs
index 1591d4c0..1596139f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs
index ad16a07d..62d06e16 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("NoticeAndSupervisionEdit.aspx") + "return false;";
GetButtonPower();
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs
index 9e9ee67c..37d5425f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs
@@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.CurrUser.LoginProjectId, true);
BLL.NoticeAndSupervisionTypeService.InitNoticeAndSupervisionType(this.drpNoticeAndSupervisionType, true);
NoticeAndSupervisionId = Request.Params["NoticeAndSupervisionId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs
index 9d13f8c5..ccff6879 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs
@@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.CurrUser.LoginProjectId, true);
BLL.NoticeAndSupervisionTypeService.InitNoticeAndSupervisionType(this.drpNoticeAndSupervisionType, true);
NoticeAndSupervisionId = Request.Params["NoticeAndSupervisionId"];
diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs
index b233634d..084942b0 100644
--- a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Meeting
MeetingId = Request.Params["MeetingId"];
this.drpHandleType.DataTextField = "Text";
this.drpHandleType.DataValueField = "Value";
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
this.HideOptions.Hidden = true;
this.rblIsAgree.Hidden = true;
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);
diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs
index ff854b75..ac93262d 100644
--- a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Meeting
if (!IsPostBack)
{
MeetingId = Request.Params["MeetingId"];
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);
if (!string.IsNullOrEmpty(MeetingId))
{
diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs
index bb6d42f6..f04dc421 100644
--- a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Meeting
MeetingId = Request.Params["MeetingId"];
this.drpHandleType.DataTextField = "Text";
this.drpHandleType.DataValueField = "Value";
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
this.HideOptions.Hidden = true;
this.rblIsAgree.Hidden = true;
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);
diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs
index 33a68a11..b130b235 100644
--- a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Meeting
if (!IsPostBack)
{
MeetingId = Request.Params["MeetingId"];
- BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);
if (!string.IsNullOrEmpty(MeetingId))
{
diff --git a/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs
index 33d6bde3..6b8ce9d3 100644
--- a/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.CQMS.Unqualified
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, false);
+ UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, false);
//主送单位
gvMainSendUnit.DataSource = UnitService.GetUnitByProjectIdList(CurrUser.LoginProjectId);
gvMainSendUnit.DataBind();
diff --git a/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs
index 3494df16..7830a0a3 100644
--- a/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Unqualified
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
+ UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpIsReply);
Funs.FineUIPleaseSelect(this.drpState);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
diff --git a/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs
index f5abf56c..0413cdfe 100644
--- a/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.CQMS.Unqualified
{
if (!IsPostBack)
{
- UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, false);
+ UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, false);
//主送单位
gvMainSendUnit.DataSource = UnitService.GetUnitByProjectIdList(CurrUser.LoginProjectId);
gvMainSendUnit.DataBind();
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs
index 778d2855..f806f826 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs
index 0cbe922c..fcc38030 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
- BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
index 79bac991..b9593049 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpPartInPersons, this.ProjectId, null, null, true);
ConstValue.InitConstNameDropDownList(this.drpHandleStep, ConstValue.Group_HandleStep, true);
///责任单位
- UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.drpWorkUnit, this.ProjectId, Const.ProjectUnitType_2, false);
+ UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpWorkUnit, this.ProjectId, Const.ProjectUnitType_2, false);
///单位工程
UnitWorkService.InitUnitWorkNameDropDownList(this.drpCheckArea, this.ProjectId, false);
}
diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx
index 9b4bc73c..09f439a3 100644
--- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx
+++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx
@@ -153,10 +153,6 @@
SortField="CheckPostName" FieldType="String" HeaderText="工作组职务"
HeaderTextAlign="Center" TextAlign="Left">
-
-
diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs
index e765a26e..6216aa92 100644
--- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.GetButtonPower();
BLL.ProjectService.InitAllProjectDropDownList(this.drpSubjectProject, true);
- BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitSeDinAndCNCECUnitDropDownList(this.drpUnit, false);
this.CheckNoticeId = Request.Params["CheckNoticeId"];
if (!string.IsNullOrEmpty(this.CheckNoticeId))
diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx
index 2537aa87..c1566f44 100644
--- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx
+++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx
@@ -24,7 +24,8 @@
-
+
@@ -52,10 +53,10 @@
-
+
-
+
diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs
index 1583e75c..8d16b2e9 100644
--- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.CheckNoticeId = Request.Params["CheckNoticeId"];
this.CheckTeamId = Request.Params["CheckTeamId"];
- BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
+ BLL.UnitService.InitUnitDropDownList(this.drpUnit, null, true);
if (!string.IsNullOrEmpty(this.CheckTeamId))
{