Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialinstance/service/MaterialInstanceManagerImpl.java
===================================================================
diff -u -r12679 -r13132
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialinstance/service/MaterialInstanceManagerImpl.java	(.../MaterialInstanceManagerImpl.java)	(revision 12679)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialinstance/service/MaterialInstanceManagerImpl.java	(.../MaterialInstanceManagerImpl.java)	(revision 13132)
@@ -13,7 +13,7 @@
 
 import org.apache.commons.lang.StringUtils;
 
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.tools.db.DatabaseUtil;
@@ -172,7 +172,7 @@
 				mapList.add(temp);
 			}
 		} else {// 一次性材料
-			String diposableGoodsSql = "select dgi.id,dg.name,dgi.amount from tousseDefinition td,diposableGoodsInstance dgi," + DisposableGoodsStock.class.getSimpleName() + " dg "
+			String diposableGoodsSql = "select dgi.id,dg.name,dgi.amount from tousseDefinition td,diposableGoodsInstance dgi," + DisposableGoods.class.getSimpleName() + " dg "
 					+ "where td.id = dgi.tousseDefinition_id and dgi.diposableGoods_id = dg.id";
 			if (StringUtils.isNotBlank(tousseDefinitionId)) {
 				diposableGoodsSql += " and td.id = " + tousseDefinitionId;
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
===================================================================
diff -u -r13103 -r13132
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 13103)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 13132)
@@ -18,7 +18,6 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -31,6 +30,7 @@
 import com.forgon.attachfile.service.AttachFileManager;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.common.CssdUtils;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialType;
@@ -39,7 +39,6 @@
 import com.forgon.systemsetting.service.HttpOptionManager;
 import com.forgon.tools.Path;
 import com.forgon.tools.db.DatabaseUtil;
-import com.forgon.tools.db.resultset.ResultSetUtil;
 import com.forgon.tools.excel.ExcelCellStyle;
 import com.forgon.tools.excel.ExcelHelper;
 import com.forgon.tools.excel.ParerUtils;
@@ -295,10 +294,10 @@
 				}
 			}
 		} else {// 一次性材料
-			List<DisposableGoodsStock> diposableGoods = objectDao.findBySql(
-					DisposableGoodsStock.class.getSimpleName(), sql
+			List<DisposableGoods> disposableGoodsList = objectDao.findBySql(
+					DisposableGoods.class.getSimpleName(), sql
 							+ " and po.isPartOfTousseMaterial = '能'");
-			for (DisposableGoodsStock diposableGood : diposableGoods) {
+			for (DisposableGoods diposableGood : disposableGoodsList) {
 				Map<String, Object> temp = new HashMap<String, Object>();
 				temp.put("id", diposableGood.getId());
 				String diposableGoodName = diposableGood.getName();