Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
===================================================================
diff -u -r13532 -r13548
--- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 13532)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 13548)
@@ -25,11 +25,13 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry;
 import com.forgon.disinfectsystem.entity.stocktakemanager.InventoryItem;
 import com.forgon.disinfectsystem.entity.stocktakemanager.InventoryRecord;
 import com.forgon.disinfectsystem.stocktakerecordmanager.service.StockTakeRecordManager;
+import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
 import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialCheckManager;
 import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialEntryManager;
 import com.forgon.serialnumber.model.SerialNum;
@@ -61,6 +63,13 @@
 	
 	private DiposableGoodBatchStockManager diposableGoodBatchStockManager;
 	
+	private MaterialDefinitionManager materialDefinitionManager;
+	
+	public void setMaterialDefinitionManager(
+			MaterialDefinitionManager materialDefinitionManager) {
+		this.materialDefinitionManager = materialDefinitionManager;
+	}
+
 	public void setMaterialCheckManager(MaterialCheckManager materialCheckManager) {
 		this.materialCheckManager = materialCheckManager;
 	}
@@ -219,6 +228,11 @@
 				JSONObject obj = new JSONObject();
 				obj.put("materialId", si.getMaterialID());
 				obj.put("cost", si.getPrice());
+				MaterialDefinition md = materialDefinitionManager.getMaterialDefinitionById(""+si.getMaterialID());
+				if(md == null){
+					throw new RuntimeException(si.getMaterialName()+",定义已不存在");
+				}
+				obj.put("goodsType", md.getGoodsType());
 				if(si.getStorageDifference() != null){
 					if(si.getStorageDifference() > 0){
 						obj.put("amount", si.getStorageDifference());