Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
===================================================================
diff -u -r15651 -r15746
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 15651)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 15746)
@@ -82,6 +82,8 @@
 		})
 	});
 	
+	itemsStore.load({params:{id:recordId}});
+	
 	form = new top.Ext.FormPanel({
 		id : 'godownEntryForm',
 		frame : true,
@@ -341,7 +343,7 @@
 		},{
 			text : '取消',
 			handler : function() {
-				window.close();
+				top.Ext.getCmp("inventoryItemWin").close();
 			}
 		}]
 	});
@@ -359,8 +361,6 @@
 	});
 	window.show();
 	
-	itemsStore.load({params:{id:recordId}});
-	
 	function cleanSelect(){
 		top.Ext.getCmp('name').setValue("");
 		top.Ext.getCmp('batchNumber').setValue("");
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
===================================================================
diff -u -r15651 -r15746
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js	(.../inventoryMaterialForm.js)	(revision 15651)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js	(.../inventoryMaterialForm.js)	(revision 15746)
@@ -2,6 +2,8 @@
 function getMaterialInventoryRecord(recordId,time,operator,wareHouseName,status){
 	var selectModel = new top.Ext.grid.CheckboxSelectionModel();
 	
+	itemsStore.load({params:{id:recordId}});
+	
 	form = new top.Ext.FormPanel({
 		id : 'godownEntryForm',
 		frame : true,
@@ -136,7 +138,7 @@
 		},{
 			text : '取消',
 			handler : function() {
-				window.close();
+				top.Ext.getCmp("inventoryItemWin").close();
 			}
 		}]
 	});
@@ -154,6 +156,4 @@
 	});
 	window.show();
 	
-	itemsStore.load({params:{id:recordId}});
-	
 }