Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
===================================================================
diff -u -r27312 -r31435
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 27312)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 31435)
@@ -718,30 +718,55 @@
 	    itemsFromStore.each(function(record){  
 	    	batchNumberList.push(record.data.batchNumber);  
 	    }); 
-//	    console.log(batchNumberList);
+		sessionStorage.setItem('batchNumberList',JSON.stringify(batchNumberList));
 	    var url = WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.mhtml?type=disposableInventoryRecord';
-	    //若导入成功则返回execel的导入数据  (找不到这个功能)
-		var importItemsJsonStr = openModalWindow(url,batchNumberList,'760','400');
-		if(importItemsJsonStr){
-			//获得execel数据json对象
-			var importJsObject = JSON.parse(importItemsJsonStr);
-//			console.log(itemsFromStore);
-//			console.log(importJsObject);
+	    //若导入成功则返回execel的导入数据
+		var importItemsJsonStr = openModalWindow(url,'','760','400');
+		if(importItemsJsonStr == undefined){
+			return;
+		}else if(importItemsJsonStr[0] !== undefined){
+			var returnValue = importItemsJsonStr;
+			if(returnValue == ''){
+				return '';
+			}
+			//获得excel数据json对象
+			var importJsObject = JSON.parse(returnValue);
 			//循环匹配导入单并设盘点数量
 			for(var i=0;i<itemsFromStore.getCount();i++){
 				var record = itemsFromStore.getAt(i);
-				var storage = record.get("amount");//当前账面数量
 				//盘点明细匹配导入单并设盘点数量
 				var isMatching = isMatchingAndSetAmount(importJsObject,record);
 				//若没有匹配到导入单则盘点数改为0
 				if(isMatching == false){
-//					var inventoryAmount = record.get("inventoryAmount");
-//					if(inventoryAmount == null || inventoryAmount == ""){
-						record.set('inventoryAmount',0);
-//					}
+					record.set('inventoryAmount',0);
 				}
 			}
 			setTotal(top.Ext.getCmp('inventoryRecordForm'));
+		}else {
+			var loop = setInterval(function() {
+				if(importItemsJsonStr.closed) {
+					clearInterval(loop);
+					
+					var returnValue = importItemsJsonStr.returnValue || '';
+					if(returnValue == ''){
+						return '';
+					}
+					//获得excel数据json对象
+					var importJsObject = JSON.parse(returnValue);
+					//循环匹配导入单并设盘点数量
+					for(var i=0;i<itemsFromStore.getCount();i++){
+						var record = itemsFromStore.getAt(i);
+						var storage = record.get("amount");//当前账面数量
+						//盘点明细匹配导入单并设盘点数量
+						var isMatching = isMatchingAndSetAmount(importJsObject,record);
+						//若没有匹配到导入单则盘点数改为0
+						if(isMatching == false){
+							record.set('inventoryAmount',0);
+						}
+					}
+					setTotal(top.Ext.getCmp('inventoryRecordForm'));
+				  }
+			},500);
 		}
 	}
 	//匹配导入盘点单