Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r31109 -r31362
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 31109)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 31362)
@@ -38,16 +38,21 @@
 	videoIdsData		视频id
  */
 function loadingVideoAndImg(imageIdsData,videoIdsData){
+	var paramsData = {
+		imageType:imageType,
+		videoType:videoType,
+		imageIds:imageIdsData,
+		videoIds:videoIdsData
+	}
+	if(objectId == '' || objectId == undefined){
+		paramsData.packingTaskId = packingTaskId;
+	}else {
+		paramsData.objectId = objectId;
+	}
 	$.ajax({
 		type : 'post',		 
 		url : WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageAndVideoInfo.do',	
-	    data:{
-			objectId:objectId,
-			imageType:imageType,
-			videoType:videoType,
-			imageIds:imageIdsData,
-			videoIds:videoIdsData
-		},
+	    data:paramsData,
 		success : function(result) {
 			var data = JSON.parse(result);
 			if(data.success){
@@ -85,7 +90,6 @@
 							}
 							
 							videoList += "<span videoId='"+data.videoArray[j].id+"'  onclick='removeImgVideo(event,this,true,true);'></span></div>";
-							//videoList += "<span objectId='"+objectId+"' serialNum='"+data.videoArray[j].serialNum+"' videoType='"+videoType+"' onclick='removeImgVideo(event,this,true);'></span></div>";
 							videoList += "<em class='video_form'>已上传</em>";
 							videoList += "<strong class='duration'>" +data.videoArray[j].duration+ "</strong>";
 							videoList += "</div>";			
@@ -323,9 +327,20 @@
 		type: "video/mp4"
 	});
 	$("#loading").show();
+	var paramsData = {
+		'size' : size, 
+		'fileTypes' : fileTypes,
+		'imageType':imageTypeEncode,
+		'videoType':videoTypeEncode
+	}
+	if(objectId == '' || objectId == undefined){
+		paramsData.packingTaskId = packingTaskId;
+	}else {
+		paramsData.objectId = objectId;
+	}
 	$.ajax({
 		type : 'post',
-		headers : {'size' : size, 'fileTypes' : fileTypes,'imageType':imageTypeEncode,'objectId':objectId,'videoType':videoTypeEncode},
+		headers : paramsData,
 		url : WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!uploadImageAndVideo.do',
 		processData: false,//不需要将传输的数据序列化
 		contentType: false,
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31351 -r31362
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31351)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31362)
@@ -1261,6 +1261,7 @@
 	       {xtype:'hidden',id:'materialId'},
 	       {xtype:'hidden',id:'vedioName'},
 		   {xtype:'hidden',id:'td_id'},
+		   {xtype:'hidden',id:'task_id'},
 		   {xtype:'hidden',id:'isTraceable'},
 		   {xtype:'hidden',id:'hideTousseName'},
 		   {xtype:'hidden',id:'hidePackedPhotographed'},
@@ -1279,13 +1280,14 @@
 						return;
 					}
 				    var imageName = Ext4.getCmp('imageName').getText();
-            	    var td_id = Ext4.getCmp('td_id').getValue();
-					if(isUndefinedOrNullOrEmpty(td_id)){
+					var td_id = Ext4.getCmp('td_id').getValue();
+					var task_id = Ext4.getCmp('task_id').getValue();
+					if(isUndefinedOrNullOrEmpty(task_id)){
            				showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage);
            				return ;
 	        		}
 					
-					takeImgAndVideo(imageName,td_id,false,imageTypeCameraPacking,videoTypePacking);
+					takeImgAndVideo(imageName,td_id,task_id,false,imageTypeCameraPacking,videoTypePacking);
                }
            },
 	       {
@@ -1298,27 +1300,11 @@
             	   var imageName = Ext4.getCmp('imageName').getText();
             	   var materialId = Ext4.getCmp('materialId').getValue();				 
             	   if(imageName != "" && materialId == ""){
-            		   var td_id = Ext4.getCmp('td_id').getValue();
-					   takeImgAndVideo(imageName,td_id,true,imageTypeCameraApplication,videoType);
-            		  // showTousseImages(imageName,td_id,imageTypeCameraApplication);
+					   var td_id = Ext4.getCmp('td_id').getValue();
+					   takeImgAndVideo(imageName,td_id,'',true,imageTypeCameraApplication,videoType);
             	   }
                }
            },
-	  /*     {
-               xtype : 'button',
-               id:'btn_cameraPhoto_packing',
-               name:'btn_cameraPhoto_packing',
-               text : '装配采集图片',
-               hidden : !sstsConfig.showCameraPhoto,
-               handler : function(){
-            	   var imageName = Ext4.getCmp('imageName').getText();
-            	   var materialId = Ext4.getCmp('materialId').getValue();
-            	   if(imageName != "" && materialId == ""){
-            		   var td_id = Ext4.getCmp('td_id').getValue();
-            		   showTousseImages(imageName,td_id,imageTypeCameraPacking);
-            	   }
-               }
-           }, */
 	       {
                xtype : 'button',
                id:'btn_packingNote',
@@ -2361,6 +2347,7 @@
     materialStore.load({params: {tousseName:tousseName,tousseDefinitionId:td_id}});
 	Ext4.getCmp('isTraceable').setValue(isTraceable);
 	Ext4.getCmp('hideTousseName').setValue(tousseName);
+	Ext4.getCmp('task_id').setValue(taskId);
     showTousseImgBtns();
 }
 
@@ -4482,7 +4469,7 @@
  * @param imageType  图片类型
  * @param videoType  视频类型
  */
-function takeImgAndVideo(tousseName,tousseDefinitionId,isLook,imageType,videoType){
+function takeImgAndVideo(tousseName,tousseDefinitionId,packingTaskId,isLook,imageType,videoType){
 	if(Ext4.chromeVersion < 62){
 	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
 		return ;
@@ -4496,9 +4483,15 @@
 
 	var packedPhotographed = Ext4.getCmp('hidePackedPhotographed').getValue();
 	var flag = packedPhotographed === "false" ? false : true;
+
+	var urls;
+
+	if(videoType == '申请采集视频'){
+		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
+	}else {
+		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoType+'&packingTaskId='+packingTaskId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
+	}
 	
-	var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
-	
 	var videoImgWin = openFullSizeWindowWithName(urls,true,'图片视频拍摄');
 	if(videoImgWin != null ){
         videoImgWin.focus(); 
@@ -4808,6 +4801,13 @@
 			packedPhotographed = record.childNodes[0].get('packedPhotographed');
 		}
 	}
+
+	if(record.childNodes.length == 1){
+		taskId = record.childNodes[0].get('taskId');
+	}else if(record.childNodes.length == 0){
+		taskId = record.get('taskId');
+	}
+
 	if(record.get('checked') == false){
 		record.set('checked', true);
 		if(storeId == 'basketTreeGrid'){
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp
===================================================================
diff -u -r29513 -r31362
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp	(.../videoAndImg.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp	(.../videoAndImg.jsp)	(revision 31362)
@@ -17,6 +17,7 @@
 <script type="text/javascript">
 	var WWWROOT = "${ctx}";
 	var objectId = '${param.objectId}';
+	var packingTaskId = '${param.packingTaskId}';
 	var imageType = '${param.imageType}'; 
 	var videoType = '${param.videoType}';
 	var goodsName = '${param.goodsName}';