Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
===================================================================
diff -u -r13080 -r28835
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js	(.../wareHouseForm.js)	(revision 13080)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js	(.../wareHouseForm.js)	(revision 28835)
@@ -67,7 +67,7 @@
 			        layout : 'form',
 			        items:[{
 						xtype : 'combo',
-						fieldLabel : '所属供应室',
+						fieldLabel : '所属科室',
 						//width:180,
 						listWidth:200,
 						id : 'orgUnitName',
@@ -77,16 +77,16 @@
 						displayField : 'departName',
 						store : new Ext.data.Store({
 							proxy : new Ext.data.HttpProxy({
-								url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getCssds.do',
+								url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
 								method : 'POST'
 							}),
 							reader : new Ext.data.JsonReader({
 								totalProperty : 'totalCount',
 								root : 'data'
 							}, [
 							    {name : 'id',mapping : 'id'},
-							    {name : 'departCode',mapping : 'departCode'},
-							    {name : 'departName',mapping : 'departName'}
+							    {name : 'departCode',mapping : 'id'},
+							    {name : 'departName',mapping : 'orgUnitName'}
 							])
 						}),
 						forceSelection : true,
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r27987 -r28835
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 27987)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 28835)
@@ -621,7 +621,7 @@
 		sqls.append("update TaskGroup set departName = '" + newOrgName + "' where departCode = '" + orgCoding + "';");
 
 		//WareHouse（仓库）
-		sqls.append("update WareHouse set orgUnitName = '" + newOrgName + "' where orgUnitCode = '" + orgCoding + "';");
+		sqls.append("update WareHouse set orgUnitName = '" + newOrgName + "', name = REPLACE(name, '" + oldOrgName + "', '" + newOrgName + "') where orgUnitCode = '" + orgCoding + "';");
 
 		//GodownEntry（入库单）
 		sqls.append("update GodownEntry set orgUnitName = '" + newOrgName + "' where orgUnitCode = '" + orgCoding + "';");
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
===================================================================
diff -u -r12835 -r28835
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js	(.../wareHouseView.js)	(revision 12835)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js	(.../wareHouseView.js)	(revision 28835)
@@ -78,8 +78,8 @@
 		var columns = [
 		    {header : "仓库id",dataIndex : 'id', hidden:true},
 		    {header : "仓库名称",width : 120,dataIndex : 'name',renderer:modifyRecord}, 
-		    {header : "所属供应室编码",width : 120,dataIndex : 'orgUnitCode'},
-		    {header : "所属供应室名称",width : 120,dataIndex : 'orgUnitName'},
+		    {header : "所属科室编码",width : 120,dataIndex : 'orgUnitCode'},
+		    {header : "所属科室名称",width : 120,dataIndex : 'orgUnitName'},
 		    {header : "仓库条码",width : 120,dataIndex : 'barcode'},
 		    {header : "顺序",width : 50,dataIndex : 'sequence'}, 
 		    {header : "备注",width : 100,dataIndex : 'remark',id:'remark'}