Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java
===================================================================
diff -u
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java	(revision 0)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java	(revision 24501)
@@ -0,0 +1,149 @@
+/**
+ * 
+ */
+package com.forgon.disinfectsystem.tousse.toussedefinition.controller;
+
+import java.util.List;
+
+import net.sf.json.JSONArray;
+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.databaseadapter.service.DateQueryAdapter;
+import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
+import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
+import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
+import com.forgon.disinfectsystem.goodFilterConfig.service.GoodFilterConfigManager;
+import com.forgon.disinfectsystem.tousse.comboTousse.service.ComboTousseManager;
+import com.forgon.disinfectsystem.tousse.cssdhandletousses.service.CssdHandleTousseManager;
+import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager;
+import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
+import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
+import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
+import com.forgon.disinfectsystem.tousse.videomanager.service.VideoFileManager;
+import com.forgon.log.service.LogManager;
+import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.json.JSONUtil;
+import com.forgon.tools.util.SpringUtils;
+
+/**
+ * @author dandan 2018年10月8日 下午4:11:25
+ *
+ */
+@RestController
+@RequestMapping(value = "/disinfectSystem/baseData/tousseDefinitionController", produces = "application/json;charset=UTF-8")
+public class TousseDefinitionController {
+
+	@Autowired
+	private LogManager appLogManager;
+	protected final Logger logger = Logger.getLogger(this.getClass());
+	@Autowired
+	private TousseDefinitionManager tousseDefinitionManager;
+	@Autowired
+	private TaskGroupManager taskGroupManager;
+	@Autowired
+	private MaterialDefinitionManager materialDefinitionManager;
+	@Autowired
+	private ImageFileManager imageFileManager;
+	@Autowired
+	private SupplyRoomConfigManager supplyRoomConfigManager;
+	@Autowired
+	private ObjectDao objectDao;
+	@Autowired
+	private VideoFileManager videoFileManager;
+	@Autowired
+	private TousseInstanceManager tousseInstanceManager;
+	@Autowired
+	private DateQueryAdapter dateQueryAdapter;
+	@Autowired
+	private GoodFilterConfigManager goodFilterConfigManagerImpl;
+	@Autowired
+	private ComboTousseManager comboTousseManagerImpl;
+	@Autowired
+	private CssdHandleTousseManager cssdHandleTousseManager;
+	@Autowired
+	private BarcodeManager barcodeManager;
+	@Autowired
+	private WareHouseManager wareHouseManager;
+
+	@RequestMapping(value="/getMaterialDefinitionByTousseName")
+	public String getMaterialDefinitionByTousseName() {
+		String tousseName = SpringUtils.getPraramValue("tousseName", "");
+		String tousseDefinitionId = SpringUtils.getPraramValue(
+				"tousseDefinitionId", "");
+		JSONArray array = new JSONArray();
+		TousseDefinition tousse = null;
+		if (StringUtils.isNotBlank(tousseDefinitionId)) {
+			tousse = tousseDefinitionManager.get(tousseDefinitionId);
+		} else if (StringUtils.isNotBlank(tousseName)) {
+			tousse = tousseDefinitionManager
+					.getTousseDefinitionByName(tousseName);
+		}
+		if (tousse != null) {
+			if (tousse.getMaterialInstances() != null) {
+				List<MaterialInstance> materialInstance = tousse
+						.getMaterialInstances();
+				for (MaterialInstance instance : materialInstance) {
+					MaterialDefinition md = instance.getMaterialDefinition();
+					if (md != null) {
+						String materialName = md.getName();
+						String specification = md.getSpecification();
+						if (StringUtils.isNotBlank(specification)) {
+							materialName += "[" + specification + "]";
+						}
+						Double cost = md.getCost();
+						JSONObject obj = new JSONObject();
+						obj.put("id", instance.getId());
+						obj.put("materialDefinitionId", md.getId());
+						obj.put("name", materialName);
+						obj.put("count", instance.getCount());
+						obj.put("type", "器械");
+						obj.put("cost", cost == null ? 0.00 : cost);
+						obj.put("notice", materialDefinitionManager
+								.getMaterialNoticeArray(md));
+						obj.put("hasNotice", md.hasNotice());
+						obj.put("washQualityCheckPoint",
+								md.getWashQualityCheckPoint());
+						obj.put("washQualityCheckMethod",
+								md.getWashQualityCheckMethod());
+						obj.put("detachable", md.getDetachable());
+
+						obj.put("functionCheck", md.getFunctionCheck());
+						array.add(obj);
+					}
+				}
+			}
+			if (tousse.getDiposableGoodsItems() != null) {
+				List<DiposableGoodsInstance> diposableGoodsInstanceList = tousse
+						.getDiposableGoodsItems();
+				for (DiposableGoodsInstance instance : diposableGoodsInstanceList) {
+					DisposableGoods disposableGoods = instance
+							.getDiposableGoods();
+					String materialName = disposableGoods.getShowName();
+					Double price = disposableGoods.getReferencePrice();
+					JSONObject obj = new JSONObject();
+					obj.put("id", instance.getId());
+					obj.put("name", materialName);
+					obj.put("count", instance.getAmount());
+					obj.put("type", "一次性物品");
+					obj.put("cost", price == null ? 0.00 : price);
+					array.add(obj);
+				}
+			}
+		}
+		JSONObject json = JSONUtil.buildJsonObject(true,"成功");
+		json.put("rows", array);
+		return json.toString();
+	}
+}