Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r20253 -r20254
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 20253)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 20254)
@@ -943,6 +943,8 @@
 		temp.put("id", disposableGoods.getId());
 		temp.put("disposableGoodsId", disposableGoods.getId());
 		temp.put("type", "一次性物品");
+		temp.put("disposableGoodsName", disposableGoods.getName());//没有拼接的名字
+		temp.put("specification", disposableGoods.getSpecification());//规格
 		temp.put("name", goodsName);
 		temp.put("spelling", disposableGoods.getSpelling());
 		temp.put("externalCode", externalCode);
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
===================================================================
diff -u -r20142 -r20254
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 20142)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 20254)
@@ -15,7 +15,7 @@
 	return exist;
 }
 
-function addItem(batchId,name,specification,amount,batchNumber,cost,supplierName,externalCode,goodsType,sequence){
+function addItem(batchId,name,specification,amount,batchNumber,cost,supplierName,externalCode,goodsType,sequence,type,unit){
 	var itemsStore = top.Ext.getCmp('inventoryRecordForm').getStore();
 	var inventoryItem = new inventoryRecordItem({
 		id:'',
@@ -29,7 +29,9 @@
 		supplierName:supplierName,
 		externalCode:externalCode,
 		goodsType:goodsType,
-		sequence : sequence
+		sequence : sequence,
+		type : type,
+		unit : unit
 	});
 	itemsStore.insert(0 , inventoryItem);
 }
@@ -83,7 +85,13 @@
 		    {name : 'referencePrice',mapping : 'referencePrice'},
 		    {name : 'externalCode',mapping : 'externalCode'},
 		    {name : 'goodsType',mapping : 'goodsType'},
-		    {name : 'sequence',mapping : 'sequence'}
+		    {name : 'sequence',mapping : 'sequence'},
+		    {name : 'specification',mapping : 'specification'},//规格
+		    {name : 'disposableGoodsName',mapping : 'disposableGoodsName'},//没拼接的名字
+		    {name : 'type',mapping : 'type'},
+		    {name : 'unit',mapping : 'unit'}
+		    
+		    
 		])
 	});
 	
@@ -244,6 +252,22 @@
 				name : 'sequence',
 				id : 'sequence'
 		    },{
+				xtype:'hidden',
+				name : 'specification',
+				id : 'specification'
+		    },{
+				xtype:'hidden',
+				name : 'disposableGoodsName',
+				id : 'disposableGoodsName'
+		    },{
+				xtype:'hidden',
+				name : 'unit',
+				id : 'unit'
+		    },{
+				xtype:'hidden',
+				name : 'type',
+				id : 'type'
+		    },{
 				text : '物品名称:'
 			},{
 				xtype : 'combo',
@@ -268,6 +292,10 @@
 						top.Ext.getCmp('externalCode').setValue(record.data.externalCode);
 						top.Ext.getCmp('goodsType').setValue(record.data.goodsType);
 						top.Ext.getCmp('sequence').setValue(record.data.sequence);
+						top.Ext.getCmp('disposableGoodsName').setValue(record.data.disposableGoodsName);
+						top.Ext.getCmp('specification').setValue(record.data.specification);
+						top.Ext.getCmp('type').setValue(record.data.type);
+						top.Ext.getCmp('unit').setValue(record.data.unit);
 						batchNumStore.baseParams.disposableGoodsID = record.data.id;
 						batchNumStore.load();
 					}
@@ -408,10 +436,14 @@
 		top.Ext.getCmp('price').setValue("");
 		top.Ext.getCmp('supplierName').setValue("");
 		top.Ext.getCmp('externalCode').setValue("");
+		top.Ext.getCmp('disposableGoodsName').setValue("");
+		top.Ext.getCmp('type').setValue("");
+		top.Ext.getCmp('specification').setValue("");
+		top.Ext.getCmp('unit').setValue("");
 	}
 	
 	function insertIntoGrid(){
-		var goodsName = top.Ext.getCmp('name').getRawValue();
+//		var goodsType = top.Ext.getCmp('name').getRawValue();//获得物品名称框显示的名字
 		var batchNumber = top.Ext.getCmp('batchNumber').getValue();
 		var amount = top.Ext.getCmp('amount').getValue();
 		var batchId = top.Ext.getCmp('batchID').getValue();
@@ -420,6 +452,11 @@
 		var externalCode = top.Ext.getCmp('externalCode').getValue();
 		var goodsType = top.Ext.getCmp('goodsType').getValue();
 		var sequence = top.Ext.getCmp('sequence').getValue();
+		var goodsName = top.Ext.getCmp('disposableGoodsName').getValue();//没有拼接的名字
+		var specification = top.Ext.getCmp('specification').getValue();//规格
+		var type = top.Ext.getCmp('type').getValue();
+		var unit = top.Ext.getCmp('unit').getValue();
+		
 		if(goodsName == ""){
 			showResult("请选择物品名称！");
 			return;
@@ -436,15 +473,15 @@
 			showResult("单价不能为空！");
 			return;
 		}
-		var specification = "";
-		var _index = goodsName.lastIndexOf('[');
-		if(_index > 0){
-			specification = goodsName.substring(_index + 1,goodsName.length-1);
-			goodsName = goodsName.substring(0,_index);
-		}
+//		var specification = "";
+//		var _index = goodsName.lastIndexOf('[');
+//		if(_index > 0){
+//			specification = goodsName.substring(_index + 1,goodsName.length-1);
+//			goodsName = goodsName.substring(0,_index);
+//		}
 	    var isExist = isExistItem(goodsName,specification,batchNumber,price);
 	    if(!isExist){
-	    	addItem(batchId,goodsName,specification,amount,batchNumber,price,supplierName,externalCode,goodsType,sequence);
+	    	addItem(batchId,goodsName,specification,amount,batchNumber,price,supplierName,externalCode,goodsType,sequence,type,unit);
 	    	cleanSelect();
 	    }else{
 	    	showResult(goodsName + "，已存在！");