Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
===================================================================
diff -u -r13953 -r13955
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 13953)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 13955)
@@ -23,10 +23,11 @@
 	{name : 'cost'},
 	{name : 'specification'},
 	{name : 'supplierName'},
-	{name : 'externalCode'}
+	{name : 'externalCode'},
+	{name : 'goodsType'}
 ]);
 	
-function addItem(batchId,name,specification,amount,batchNumber,cost,supplierName,externalCode){
+function addItem(batchId,name,specification,amount,batchNumber,cost,supplierName,externalCode,goodsType){
 	var inventoryItem = new inventoryRecordItem({
 		id:'',
 		disposableGoodsBatchId:batchId,
@@ -37,7 +38,8 @@
 		batchNumber:batchNumber,
 		cost:cost,
 		supplierName:supplierName,
-		externalCode:externalCode
+		externalCode:externalCode,
+		goodsType:goodsType
 	});
 	itemsStore.insert(0 , inventoryItem);
 }
@@ -60,7 +62,8 @@
 		    {name : 'name',mapping : 'name'},
 		    {name : 'displayName',mapping : 'displayName'},
 		    {name : 'referencePrice',mapping : 'referencePrice'},
-		    {name : 'externalCode',mapping : 'externalCode'}
+		    {name : 'externalCode',mapping : 'externalCode'},
+		    {name : 'goodsType',mapping : 'goodsType'}
 		])
 	});
 	
@@ -203,6 +206,10 @@
 				id : 'cost'
 		    },{
 				xtype:'hidden',
+				name : 'goodsType',
+				id : 'goodsType'
+		    },{
+				xtype:'hidden',
 				name : 'supplierName',
 				id : 'supplierName'
 		    },{
@@ -228,6 +235,7 @@
 				listeners : {
 					select : function(combo, record, index) {
 						top.Ext.getCmp('externalCode').setValue(record.data.externalCode);
+						top.Ext.getCmp('goodsType').setValue(record.data.goodsType);
 						batchNumStore.baseParams.disposableGoodsID = record.data.id;
 						batchNumStore.load();
 					}
@@ -366,6 +374,7 @@
 		var cost = top.Ext.getCmp('cost').getValue();
 		var supplierName = top.Ext.getCmp('supplierName').getValue();
 		var externalCode = top.Ext.getCmp('externalCode').getValue();
+		var goodsType = top.Ext.getCmp('goodsType').getValue();
 		if(goodsName == ""){
 			showResult("请选择物品名称！");
 			return;
@@ -382,7 +391,7 @@
 		}
 	    var isExist = isExistItem(goodsName,specification,batchNumber);
 	    if(!isExist){
-	    	addItem(batchId,goodsName,specification,amount,batchNumber,cost,supplierName,externalCode);
+	    	addItem(batchId,goodsName,specification,amount,batchNumber,cost,supplierName,externalCode,goodsType);
 	    	cleanSelect();
 	    }else{
 	    	showResult(goodsName + "，已存在！");