diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
index 50a2f7df..87d567f9 100644
--- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
+++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
@@ -605,7 +605,14 @@ namespace BLL
             return cusBillCode;
         }
 
-
+        public static Dictionary<string, string> GetWarehouseCode(string projectId)
+        {
+            var q = (from x in Funs.DB.Tw_InOutPlanMaster
+                     where x.ProjectId == projectId &&
+                     x.InOutType == (int)TwConst.InOutType.入库
+                     select x.WarehouseCode).Distinct().ToDictionary(x => x, x => x);
+            return q;
+        }
         public static string GetDataInCusBillCode(string projectid, string unitcode, string typeString, string unitWorkCode = "", string Category = "")
         {
             if (typeString == TwConst.TypeInt.其他入库.ToString())
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
index 72a06a07..8a93f70d 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
@@ -20,9 +20,9 @@ namespace FineUIPro.Web.CLGL
         {
             if (!IsPostBack)
             {
-                drpWarehouse.DataTextField = "Text";
+                drpWarehouse.DataTextField = "Key";
                 drpWarehouse.DataValueField = "Value";
-                drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
+                drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
                 drpWarehouse.DataBind();
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 // 绑定表格
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
index c05eeae2..a2455755 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
@@ -71,9 +71,9 @@ namespace FineUIPro.Web.CLGL
         private void InitDrpList()
         {
             this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
-            drpWarehouse.DataTextField = "Text";
+            drpWarehouse.DataTextField = "Key";
             drpWarehouse.DataValueField = "Value";
-            drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
+            drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
             drpWarehouse.DataBind();
             Funs.FineUIPleaseSelect(this.drpWarehouse);
             drpTypeInt.DataTextField = "Key";
diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
index db704057..030755e4 100644
--- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
@@ -30,9 +30,9 @@ namespace FineUIPro.Web.CLGL
         private void InitDrpList()
         {
             this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
-            drpWarehouse.DataTextField = "Text";
+            drpWarehouse.DataTextField = "Key";
             drpWarehouse.DataValueField = "Value";
-            drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
+            drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
             drpWarehouse.DataBind();
             Funs.FineUIPleaseSelect(this.drpWarehouse);
             drpTypeInt.DataTextField = "Key";
diff --git a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs
index 0b33b7e8..841f2295 100644
--- a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs
@@ -12,9 +12,9 @@ namespace FineUIPro.Web.CLGL
             if (!IsPostBack)
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
-                drpWarehouse.DataTextField = "Text";
+                drpWarehouse.DataTextField = "Key";
                 drpWarehouse.DataValueField = "Value";
-                drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
+                drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
                 drpWarehouse.DataBind();
                 Funs.FineUIPleaseSelect(this.drpWarehouse);
                 // 绑定表格
diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
index 1ceb6917..a60ac02c 100644
--- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
@@ -28,9 +28,9 @@ namespace FineUIPro.Web.CLGL
 
         private void InitDrpList()
         {
-            drpWarehouse.DataTextField = "Text";
+            drpWarehouse.DataTextField = "Key";
             drpWarehouse.DataValueField = "Value";
-            drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
+            drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
             drpWarehouse.DataBind();
             Funs.FineUIPleaseSelect(this.drpWarehouse);
             drpTypeInt.DataTextField = "Key";
diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs
index 2b3543c6..44ac50eb 100644
--- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs
@@ -85,9 +85,9 @@ namespace FineUIPro.Web.CLGL
         private void InitDrpList()
         {
 
-            drpWarehouse.DataTextField = "Text";
+            drpWarehouse.DataTextField = "Key";
             drpWarehouse.DataValueField = "Value";
-            drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
+            drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
             drpWarehouse.DataBind();
 
             string[] typeIntArr = { TwConst.TypeInt.散件出库.ToString(), TwConst.TypeInt.其他出库.ToString() };
diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
index e85d6dfa..0b2a3193 100644
--- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
@@ -32,9 +32,9 @@ namespace FineUIPro.Web.CLGL
 
         private void InitDrpList()
         {
-            drpWarehouse.DataTextField = "Text";
+            drpWarehouse.DataTextField = "Key";
             drpWarehouse.DataValueField = "Value";
-            drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
+            drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
             drpWarehouse.DataBind();
             Funs.FineUIPleaseSelect(this.drpWarehouse);
             drpTypeInt.DataTextField = "Key";