Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.jsp
===================================================================
diff -u -r29513 -r31434
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.jsp	(.../importInventoryRecord.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.jsp	(.../importInventoryRecord.jsp)	(revision 31434)
@@ -100,9 +100,9 @@
 }
 function importData(){
 	//获得页面盘点明细的批次号/材料“名称+规格”
-	var batchNumberList = window.dialogArguments
-	if(batchNumberList){
-		document.getElementById("batchNumberList").value = batchNumberList;
+	var batchNumberList = sessionStorage.getItem('batchNumberList') || '';
+	if(batchNumberList !== ''){
+		document.getElementById("batchNumberList").value = JSON.parse(batchNumberList);
 	}
     if(validatorForm($Id('importMaterialDefinitionForm'))){
         $Id('importMaterialDefinitionForm').submit();
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
===================================================================
diff -u -r27312 -r31434
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js	(.../inventoryMaterialForm.js)	(revision 27312)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js	(.../inventoryMaterialForm.js)	(revision 31434)
@@ -333,13 +333,20 @@
     	// 通过材料名称+规格区分不同材料
     	var materialStr = record.data.name + record.data.specification;
     	materialIdStr.push(materialStr.trim());  
-    });
-    var url = WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.mhtml?type=materialInventoryRecord';
-    //若导入成功则返回excel的导入数据(找不到这个功能)
-	var importItemsJsonStr = openModalWindow(url,materialIdStr,'760','400');
-	if(importItemsJsonStr){
+	});
+	sessionStorage.setItem('batchNumberList',JSON.stringify(materialIdStr));
+	var url = WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.mhtml?type=materialInventoryRecord';
+	//若导入成功则返回excel的导入数据
+	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(importItemsJsonStr);
+		var importJsObject = JSON.parse(returnValue);
 		//循环匹配导入单并设盘点数量
 		for(var i=0;i<itemsFromStore.getCount();i++){
 			var record = itemsFromStore.getAt(i);
@@ -351,7 +358,31 @@
 				record.set('inventoryAmount',0);
 			}
 		}
-	}
+    }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);
+					}
+				}
+			  }
+        },500);
+    }
 }
 
 //匹配导入盘点单