Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java
===================================================================
diff -u -r12703 -r12710
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java	(.../ImportSingleStorageController.java)	(revision 12703)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportSingleStorageController.java	(.../ImportSingleStorageController.java)	(revision 12710)
@@ -1,6 +1,7 @@
 package com.forgon.disinfectsystem.maintain.importbasedata.action;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -11,9 +12,12 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindException;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.forgon.attachfile.service.AttachFileManager;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.maintain.importbasedata.service.ImportBasedataManager;
 
 /**
@@ -27,20 +31,26 @@
 
 	private ImportBasedataManager importBasedataManager;
 	
+	private WareHouseManager wareHouseManager;
+	
 	private AttachFileManager attachFileManager;
 
 	public void setAttachFileManager(AttachFileManager attachFileManager) {
 		this.attachFileManager = attachFileManager;
 	}
 
+	public void setWareHouseManager(WareHouseManager wareHouseManager) {
+		this.wareHouseManager = wareHouseManager;
+	}
+
 	public void setImportBasedataManager(
 			ImportBasedataManager importBasedataManager) {
 		this.importBasedataManager = importBasedataManager;
 	}
 
-	@RequestMapping("/disinfectsystem/basedatamanager/importbasedata/importSingleStorage")
+	@RequestMapping(value = "/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.mhtml", method=RequestMethod.POST)
 	protected ModelAndView onSubmit(HttpServletRequest request,
-			HttpServletResponse response, Object command, BindException errors)
+			HttpServletResponse response)
 			throws Exception {
 		String msg = "导入成功!";
 		String[][] retMsgObj = new String[1][3];
@@ -74,6 +84,7 @@
 		return new ModelAndView(redirectUrl, "msg", retMsgObj);
 	}
 
+	@RequestMapping(value = "/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.mhtml", method=RequestMethod.GET)
 	protected Object formBackingObject(HttpServletRequest request)
 			throws Exception {
 		boolean isDiposable = "diposable".equals(request.getParameter("type"));
@@ -86,9 +97,15 @@
 			formatFile = "/disinfectsystem/basedatamanager/importbasedata/material.xls";
 			poName = "材料入库单";
 		}
+		// 获取仓库
+		List<WareHouse> wareHouses = wareHouseManager.getAll();
+		if(wareHouses == null){
+			wareHouses = new ArrayList<WareHouse>();
+		}
+		request.setAttribute("wareHouses", wareHouses);
 		request.setAttribute("poName", poName);
 		request.setAttribute("actionUrl","/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.mhtml");
 		request.setAttribute("formatFile",formatFile); 
-		return new Object();
+		return "/disinfectsystem/basedatamanager/importbasedata/importSingleStorage";
 	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.jsp
===================================================================
diff -u -r12532 -r12710
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.jsp	(.../importSingleStorage.jsp)	(revision 12532)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importSingleStorage.jsp	(.../importSingleStorage.jsp)	(revision 12710)
@@ -78,12 +78,30 @@
         btf = false; 
         return false;
     }
+    // 是否已经选择仓库
+    var warehouseName = document.getElementById("warehouseName");
+    if(!validateWarehouse()){
+        btf = false; 
+        return false;
+    }
     waiting();
     return true;
     
     
 }
 
+// 校验仓库
+function validateWarehouse(){
+	var warehouseIDObj = document.getElementById("warehouseID");
+	if(warehouseIDObj.selectedIndex < 0){
+		alert("请选择仓库！");
+		return false;
+	}
+	var option = warehouseIDObj.options[warehouseIDObj.selectedIndex];
+	document.getElementById("warehouseName").value = option.text;
+	//document.getElementById("warehouseName").value = document.getElementById("warehouseID").text;
+	return true;
+}
 function waiting(){
     obj = document.getElementById("loading_container");
     if (obj != null){
@@ -143,6 +161,16 @@
 				style="padding-top:10px;"><th:attach
 				poObjectName="MaterialDefinition"></th:attach></td>
 		</tr>
+		<tr height="30">
+			<td width="130" valign="top" style="padding-top: 10px;"
+				class="form_label">仓库:</td>
+			<td class="table_td_text" style="word-break: break-all;"
+				style="padding-top:10px;"><select id="warehouseID" name="warehouseID" >
+				<c:forEach items="${wareHouses}" var="wareHouse">
+					<option value="${wareHouse.id}">${wareHouse.name}</option>
+				</c:forEach>
+				</select></td>
+		</tr>
 	</table>
 	<div style="height: 30px;"></div>
 	<table width="100%" border="1" align="center" cellpadding="0"
@@ -167,6 +195,7 @@
 	</div>
 	</div>
 	</div>
+	<input type="hidden" id="warehouseName" name="warehouseName" />
 </form:form></div>
 </body>
 </html>
\ No newline at end of file