Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/controller/WareHouseController.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/controller/WareHouseController.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/controller/WareHouseController.java	(revision 24496)
@@ -0,0 +1,59 @@
+/**
+ * 
+ */
+package com.forgon.disinfectsystem.basedatamanager.warehouse.controller;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.action.WareHouseAction;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
+import com.forgon.tools.json.JSONUtil;
+import com.forgon.tools.util.SpringUtils;
+
+/**
+ * @author dandan 2018年10月8日 下午3:35:05
+ *
+ */
+@RestController
+@RequestMapping(value = "/disinfectSystem/baseData/wareHouseController", produces = "application/json;charset=UTF-8")
+public class WareHouseController {
+
+	private Logger logger = Logger.getLogger(WareHouseAction.class);
+
+	@Autowired
+	private WareHouseManager wareHouseManager;
+	@Autowired
+	private SupplyRoomConfigManager supplyRoomConfigManager;
+
+	/**
+	 * 获取登录用户的所有仓库
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/getWareHouseData")
+	public String getWareHouseData() {
+		JSONObject json = null;
+		try {
+			String isCssd = SpringUtils.getPraramValue("isCssd", null);
+			if (StringUtils.equals(isCssd, "yes")) {
+				json = wareHouseManager.getCssdWareHouse();
+			} else {
+				String orgUnitCoding = AcegiHelper.getLoginUser()
+						.getCurrentOrgUnitCode();
+				json = wareHouseManager.getAllWareHouse(orgUnitCoding);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			json = JSONUtil.buildJsonObject(false, e.getMessage());
+		}
+		return json.toString();
+	}
+}