Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
===================================================================
diff -u -r12331 -r12666
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12666)
@@ -35,10 +35,11 @@
 	if(selectFirst){
 		if(batches.length > 0){
 			setCmpValue('batchNumber1',batches[0].batchNumber);
+			
+			var combo = top.Ext.getCmp("batchNumber1");
+			// 触发选中事件
+			combo.fireEvent('select', combo,diposableGoodsBatchNumStore.getAt(0),0);
 		}
-		var combo = top.Ext.getCmp("batchNumber1");
-		// 触发选中事件
-		combo.fireEvent('select', combo,diposableGoodsBatchNumStore.getAt(0),0);
 	}
 }
 //设置价格
@@ -58,6 +59,22 @@
 		}
 	}
 }
+
+var wareHouseStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		totalProperty : 'totalCount',
+		root : 'data'
+	}, [
+	    {name : 'id',mapping : 'id'},
+	    {name : 'name',mapping : 'name'},
+	    {name : 'orgUnitCode',mapping : 'orgUnitCode'},
+	])
+});
+
 var diposableGoodsStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do',
@@ -366,7 +383,7 @@
 	        	{header : "供应商",width : 150,dataIndex : 'supplierName',menuDisabled : true},
 	        	{id : 'expandColumn',header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton}
 	        ]),
-			width :735,
+			width :835,
 			autoExpandColumn : 'expandColumn',
 			selModel : new top.Ext.grid.RowSelectionModel({
 				singleSelect : false
@@ -380,6 +397,36 @@
 				name : 'barcode',
 				id : 'barcode'
 			},{
+				text : '仓库:'
+			},{
+
+				xtype : 'combo',
+				id : 'wareHouse1',
+				name : 'wareHouse1',
+				minChars : 0,
+				valueField : 'id',
+				displayField : 'name',
+				store : wareHouseStore,
+				forceSelection : true,
+				lazyInit : false,
+				triggerAction : 'all',
+				hideTrigger : true,
+				typeAhead : false,
+				allowBlank : true,
+				width : 100,
+				listeners : {
+					select : function(combo, record, index) {
+						top.Ext.getCmp('wareHouse1').setValue(record.data.name);
+						top.Ext.getCmp('name1').focus();
+					},
+					specialkey : function(field, ee) {
+						if (ee.getKey() == Ext.EventObject.ENTER) {
+							top.Ext.getCmp('name1').focus();
+						}
+					}
+				}
+			
+			},{
 				text : '名称:'
 			},{
 				xtype : 'combo',
@@ -555,7 +602,7 @@
 		id : 'recyclingApplicationWin',
 		layout : 'fit',
 		title : '退库单信息',
-		width : 810,
+		width : 910,
 		height :500,
 		modal : true,
 //		autoHeight : true,
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java
===================================================================
diff -u -r12652 -r12666
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java	(.../WareHouseAction.java)	(revision 12652)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/WareHouseAction.java	(.../WareHouseAction.java)	(revision 12666)
@@ -6,7 +6,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletResponse;
 
 import net.sf.json.JSONObject;
@@ -20,10 +19,11 @@
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
+import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.directory.model.OrgUnit;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.tools.StrutsParamUtils;
 import com.opensymphony.xwork2.ModelDriven;
@@ -189,6 +189,39 @@
 
 	}
 
+	/**
+	 * 获取登录用户的所有仓库
+	 * 
+	 * @return
+	 */
+	public void getWareHouseData() {
+		try {
+			String orgUnitCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
+			OrgUnit orgUnit = new OrgUnit();
+			orgUnit.setOrgUnitCoding(orgUnitCoding);
+			List<WareHouse> wareHouselist = wareHouseManager.getWareHouseListByOrgUnit(orgUnit);
+			List<Map<String,Object>> data = new ArrayList<Map<String,Object>>();
+			for (WareHouse wareHouse : wareHouselist) {
+				Map<String, Object> temp = new HashMap<String, Object>();
+				temp.put("id", wareHouse.getId());
+				temp.put("name", wareHouse.getName());
+				temp.put("orgUnitCode", wareHouse.getOrgUnitCode());
+				data.add(temp);
+			}
+			Map<String, Object> map = new HashMap<String, Object>();
+			map.put("totalCount", data.size());
+			map.put("data", data);
+			
+			JSONObject json = JSONObject.fromObject(map);
+			HttpServletResponse response = StrutsParamUtils.getResponse();
+			response.setCharacterEncoding("UTF-8");
+			PrintWriter out = response.getWriter();
+			out.print(json);
+			out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 
 	@Override
 	public void prepare() throws Exception {