Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32008 -r32045
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32008)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32045)
@@ -576,7 +576,6 @@
     var barcode = tempBarcode;
     PackingTableManager.getIDCardInfoForPackingView(barcode,function(resultJsonStr){
     	var result = JSON.parse(resultJsonStr);
-	
     	if(isUndefinedOrNullOrEmpty(result.errorMsg)){
     		barcode = result.idCard.barcode;
     		var tousseName = result.idCard.tousseDefinition.name;
@@ -647,6 +646,15 @@
 		var td_id = idCardTaskNode.get('tousseID');
 		var taskId = idCardTaskNode.get('taskId');
 		var isTraceable = idCardTaskNode.get('isTraceable');
+		if(result.idCard.tousseDefinition.needInspectMaterials){
+			var tousseID = result.idCard.tousseDefinition.id+'+标识牌';
+			var tousseName = result.idCard.tousseDefinition.name;
+			var resultAmount = 1;
+			var arr = getPackingMaterialsForCheck.get(tousseID) || [];
+			arr[0] = tousseName;
+			arr[1] = resultAmount;
+			getPackingMaterialsForCheck.set(tousseID,arr);
+		}
 		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable,taskId);
 		lastSelectTousseName = tousseName;
 		lastSelectimageTypeTousse = imageType_tousse;
@@ -656,7 +664,6 @@
    		var isPrint = idCardTaskNode.get('isPrint');
    		var isReview = idCardTaskNode.get('isReview');
 		showPackButton(isPrint,isReview,tousseType);
-		
 	}
 	// 取消选中所有的装配任务，只选中该标识牌的
 	uncheckAllExceptCurrentIDCardPackingTask();
@@ -2426,11 +2433,15 @@
     			}
     		}
 			if(sstsConfig.enablePackingMaterialsCheckFunction){
-				if(getPackingMaterialsForCheck.get(tousseDefinitionId)){
-					var arr = getPackingMaterialsForCheck.get(tousseDefinitionId);
+				var tid = tousseDefinitionId;
+				if(!getPackingMaterialsForCheck.get(tousseDefinitionId) && getPackingMaterialsForCheck.get(tousseDefinitionId+'+标识牌')){
+					tid = tousseDefinitionId+'+标识牌';
+				}
+				if(getPackingMaterialsForCheck.get(tid)){
+					var arr = getPackingMaterialsForCheck.get(tid);
 					tousseName[0] = arr[0];
 					tousseName[1] = arr[1];
-					getPackingMaterialsForCheck.set(tousseDefinitionId,tousseName);
+					getPackingMaterialsForCheck.set(tid,tousseName);
 				}
 			}
     		Ext4.getCmp('materialAmount').setText("器械总数:" + materialTotalAmount);
@@ -4830,6 +4841,14 @@
 				}
 			}
 			speakBasket.speakContent();
+			if(sstsConfig.enablePackingMaterialsCheckFunction){
+				var keys = getPackingMaterialsForCheck.keys();
+				for(var i=0;i<keys.length;i++){
+					if(typeof keys[i] == 'string'){
+						getPackingMaterialsForCheck.remove(keys[i]);
+					}
+				}
+			}
 		},
 		failure : function(){myMask.hide();}
 	});
@@ -4916,6 +4935,14 @@
 			clearInputedIDCardInfo();
 		}
 	}
+	if(sstsConfig.enablePackingMaterialsCheckFunction){
+		var keys = getPackingMaterialsForCheck.keys();
+		for(var i=0;i<keys.length;i++){
+			if(typeof keys[i] == 'string'){
+				getPackingMaterialsForCheck.remove(keys[i]);
+			}
+		}
+	}
 	refreshErrorAndDamageRemark(record);
 	refreshRemarks(record);
 	refreshRecyclingItemRemark(record);
@@ -5038,31 +5065,47 @@
 
 //GZTHZL-1:材料添加背景色
 function materialsAddBgColor(tousseDefinitionId,rowIndex,td) {
-	if(tousseDefinitionId !== clickItemId){
-		return false;
+	var tid = tousseDefinitionId;
+	if(!getPackingMaterialsForCheck.get(tid) && getPackingMaterialsForCheck.get(tid+'+标识牌')){
+		tid = tid+'+标识牌';
 	}
-	if(getPackingMaterialsForCheck.get(tousseDefinitionId)){
-		var packingMaterialsArray = getPackingMaterialsForCheck.get(tousseDefinitionId);
+	if(typeof tid == 'string'){
+		if(parseInt(tid.split('+')[0]) !== parseInt(clickItemId)){
+			return false;
+		}
+	}else {
+		if(parseInt(tid) !== parseInt(clickItemId)){
+			return false;
+		}
+	}
+	if(getPackingMaterialsForCheck.get(tid)){
+		var packingMaterialsArray = getPackingMaterialsForCheck.get(tid);
 		var tousseName = packingMaterialsArray[0];
 		var amount = packingMaterialsArray[1];
 		if(amount > 1){
 			showResult('一次只能检查一个物品，请先将【'+tousseName+'】的物品数量改成1后再进行检查并装配！')
 			return false
 		}
 		if(rowIndex == undefined){
-			for(var i=2;i<packingMaterialsArray.length;i++){
-				if(packingMaterialsArray[i] !== true){
-					$('#materialGrid-body').find('tr.x4-grid-data-row').eq(i-2).find('td').eq(1).addClass('tousseNameBgColor');
-					packingMaterialsArray[i] = true;
-					getPackingMaterialsForCheck.set(tousseDefinitionId,packingMaterialsArray);
+			for(var i=packingMaterialsArray.length;i>0;i--){
+				if(packingMaterialsArray[i] == true){
+					if(packingMaterialsArray[i+1]){
+						$('#materialGrid-body').find('tr.x4-grid-data-row').eq(i-1).find('td').eq(1).addClass('tousseNameBgColor');
+						packingMaterialsArray[i+1] = true;
+						getPackingMaterialsForCheck.set(tid,packingMaterialsArray);
+					}
 					return false
 				}
 			}
 		}else {
 			if(packingMaterialsArray[(rowIndex+2)] !== true){
 				$(td).addClass('tousseNameBgColor');
 				packingMaterialsArray[(rowIndex+2)] = true;
-				getPackingMaterialsForCheck.set(tousseDefinitionId,packingMaterialsArray);
+				getPackingMaterialsForCheck.set(tid,packingMaterialsArray);
+			}else {
+				$(td).removeClass('tousseNameBgColor');
+				packingMaterialsArray[(rowIndex+2)] = $(td).find('div').text();
+				getPackingMaterialsForCheck.set(tid,packingMaterialsArray);
 			}
 		}
 	}
@@ -5752,7 +5795,7 @@
 document.onkeydown = showKeyDown;
 //监听空格键
 function showKeyDown() {
-	if(event.keyCode == 32){
+	if(event.keyCode == 17){
 		if(sstsConfig.enablePackingMaterialsCheckFunction){
 			if(getPackingMaterialsForCheck.size() == 1){
 				var tousseDefinitionId = getPackingMaterialsForCheck.element(0).key;