Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r32140 -r32149
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 32140)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 32149)
@@ -345,7 +345,7 @@
   <p id="confirmMsg"></p>
 </div>
 
-<div id="dialogShowIDCardBarcodes" title="清选择标识牌进行拍摄">
+<div id="dialogShowIDCardBarcodes" title="请选择标识牌进行拍摄">
 </div>
 
 <style type="text/css">
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32113 -r32149
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32113)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32149)
@@ -1300,7 +1300,6 @@
            				showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage);
            				return ;
 	        		}
-					
 					takeImgAndVideo(imageName,td_id,task_id,false,imageTypeCameraPacking,videoTypePacking);
                }
            },
@@ -4555,6 +4554,7 @@
 	if(tousseDefinitionId == "null"){
 		tousseDefinitionId = "";
 	}
+	var barcode = idCardBarcode || '';
 	var imgType = '';
 	if(videoType !== '申请采集视频'){
 		tousseDefinitionId = packingTaskId;
@@ -4564,6 +4564,7 @@
 		tousseDefinitionId: tousseDefinitionId,
 		goodsName:tousseName,
 		isLook: isLook,
+		barcode:barcode,
 		imageType: imageType,
 		videoType: videoType,
 		imageIds:imageIds,
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r32144 -r32149
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 32144)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 32149)
@@ -380,7 +380,6 @@
 				blobs = [];
 				size = null;
 				fileTypes = null;
-				
 				var imageIdsVal =  getImageIds();				
 				if(imageIdsVal != ''){
 					if(imageIds !=""){
@@ -420,18 +419,32 @@
 				}
 			
 				loadingVideoAndImg(imageIds,videoIds);
+
+				if(imageIds != ""){
+					var imageIdsAll = imageIds.split(",");
+					for(var i = 0;i < imageIdsAll.length;i++){
+						returnImageFileId(goodsName,imageIdsAll[i]);
+					}
+				}
 				
+				if(videoIds != ""){
+					var videoIdsAll = videoIds.split(",");					
+					for(var j = 0;j < videoIdsAll.length;j++){
+						returnVideoFileId(goodsName,videoIdsAll[j]);
+					}
+				}
+				
 				//传给上级页面用做提交的参数
 				if(window.opener.document.getElementById("imageIdsAndGoodsName")){
 					var imageIdsAndGoodsName = window.opener.document.getElementById("imageIdsAndGoodsName");
 					imageIdsAndGoodsName.value = JSON.stringify(goodsNameImageFile2);
-				}				
+				}
 				
 				if(window.opener.document.getElementById("videoIdsAndGoodsName")){
 					var videoIdsAndGoodsName = window.opener.document.getElementById("videoIdsAndGoodsName");
 					videoIdsAndGoodsName.value = JSON.stringify(goodsNameVideoeFile2);
 				}
-			
+				
 				if(window.opener.document.getElementById("imageIds")){
 					var imageIdsDom = window.opener.document.getElementById("imageIds");
 					imageIdsDom.value = imageIds;