Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r24772 -r24791
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24772)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24791)
@@ -976,7 +976,7 @@
 //	        			showToussePackingNote(td_id);
 	        		}
             	    // 弹出窗口
-            	   var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?objectId='+td_id;
+            	   var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?objectId='+td_id+'&imageType=' + imageTypeCameraPacking;
             	   var style="menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=no,"+getCenterWindowPos(1920,1080)+",scrollbars=no";
             	   var popwin=window.open(pageUrl,'图片采集',style);
             	   if(popwin != null ){
@@ -986,21 +986,36 @@
            },
 	       {
                xtype : 'button',
-               id:'btn_cameraPhoto',
-               name:'btn_cameraPhoto',
-               text : '采集图片',
+               id:'btn_cameraPhoto_application',
+               name:'btn_cameraPhoto_application',
+               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,'采集图片');
+            		   showTousseImages(imageName,td_id,imageTypeCameraApplication);
             	   }
                }
            },
 	       {
                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',
                name:'btn_packingNote',
                text : '配包注意事项',
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r24786 -r24791
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 24786)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 24791)
@@ -263,6 +263,11 @@
 				if(td != null){
 					imageCount = td.getImagesCount(objectDao,ImageFile.IMAGE_TYPE_CAMERA_PACKING);
 				}
+			}else if (ImageFile.IMAGE_TYPE_CAMERA_APPLICATION.equals(imageType)){
+				TousseDefinition td = tousseDefinitionManager.get(id);
+				if(td != null){
+					imageCount = td.getImagesCount(objectDao,ImageFile.IMAGE_TYPE_CAMERA_APPLICATION);
+				}
 			}
 		}
 		HttpServletResponse httpServletResponse = StrutsParamUtils
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r24786 -r24791
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 24786)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 24791)
@@ -781,30 +781,60 @@
 	}
 	var success = getForeignTousseInfo();
 	if(success){
+		var foreignTousseInfoValue = top.Ext4.getCmp('foreignTousseInfo').getValue();
+		if(foreignTousseInfoValue){
+			var foreignTousseInfoArray = JSON.parse(foreignTousseInfoValue);
+			if(foreignTousseInfoArray && foreignTousseInfoArray.length > 0){
+				for(var i = 0;i < foreignTousseInfoArray.length;i++){
+					var foreignTousseInfoObject = foreignTousseInfoArray[i];
+					if(goodsNameImageFile[foreignTousseInfoObject.oldTousseName]
+						&& goodsNameImageFile[foreignTousseInfoObject.oldTousseName].length > 0){
+						foreignTousseInfoObject.imageFileIds = goodsNameImageFile[foreignTousseInfoObject.oldTousseName].join(",");
+					}
+				}
+				top.Ext4.getCmp('foreignTousseInfo').setValue(JSON.stringify(foreignTousseInfoArray));
+			}
+		}
 		submintForeignTousseForm(ACTION_TYPE_ADD, needPrint);
 	}
 }
 
 /**
  * 拍照
+ * @param tousseName 包定义名称
  * @param tousseDefinitionId 包定义id
  */
-function takePhone(tousseDefinitionId){
+function takePhone(tousseName,tousseDefinitionId){
 	if(Ext4.chromeVersion < 62){
 		   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
 			return ;
 	   }
-	    // 弹出窗口
-	   var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?imageType='+imageTypeCameraApplication;
+	   // 弹出窗口
+	   var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?goodsName='+ tousseName +'&imageType='+imageTypeCameraApplication;
+	   //如果为打开申请单修改,则可以追加拍照图片
+	   if(id){
+		   pageUrl += '&objectId='+tousseDefinitionId;
+	   }
 	   var style="menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=no,"+getCenterWindowPos(1920,1080)+",scrollbars=no";
 	   var popwin=window.open(pageUrl,'图片采集',style);
 	   if(popwin != null ){
 	       popwin.focus(); 
 	   }
 }
 
-function returnImageFileId(imageFileId){
-	alert("imageFileId=" + imageFileId);
+//记录每个包名对应的图片id
+var goodsNameImageFile = {};
+//接收新上传的imageFile的id
+function returnImageFileId(goodsName , imageFileId){
+	if(goodsNameImageFile[goodsName]){
+		var imageFileArray = goodsNameImageFile[goodsName];
+		imageFileArray.push(imageFileId);
+		goodsNameImageFile[goodsName] = imageFileArray;
+	}else{
+		var imageFileArray = [];
+		imageFileArray.push(imageFileId);
+		goodsNameImageFile[goodsName] = imageFileArray;
+	}
 }
 
 /**
@@ -1496,8 +1526,11 @@
         	if(!isLeaf){
         		var btnHtml = "<img src=\""+WWWROOT+"/images/web/image_.gif\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('"+tousseName+"','"+tousseDefinitionId+"')\" >";
         		if(sstsConfig.showCameraPhoto){
-        			btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo_16x16.gif\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('"+tousseName+"','"+tousseDefinitionId+"','采集图片')\" >";
-        			btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo.png\" onclick=\"getCurrentTab().takePhone('"+tousseDefinitionId+"')\" >";
+        			if(id){
+        				//只有再次打开该单修改时,才能查看图片
+        				btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo_16x16.gif\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('"+tousseName+"','"+tousseDefinitionId+"','"+ imageTypeCameraApplication +"')\" >";
+        			}
+        			btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo.png\" onclick=\"getCurrentTab().takePhone('"+tousseName+"','"+tousseDefinitionId+"')\" >";
         		}
         		return btnHtml;
         	}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r24654 -r24791
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 24654)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 24791)
@@ -1,6 +1,7 @@
 package com.forgon.disinfectsystem.foreigntousseapplication.service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -30,6 +31,7 @@
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
+import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier;
@@ -496,6 +498,7 @@
 			String supplierName = obj.optString("supplierName");
 			Double price = obj.optDouble("price");
 			String recyclingStatus = obj.optString("recyclingStatus");
+			String imageFileIds = obj.optString("imageFileIds");
 			Long appid = foreignTousseApplication.getId();
 			if(StringUtils.isBlank(tousseName)){
 				throw new RuntimeException("外来器械包名称不能为空！");
@@ -663,6 +666,11 @@
 			}
 
 			tousseDefinitionManager.saveOrUpdate(tousseDefinition);
+			//如果图片id不为空,则将图片数据的对象设置为新包定义的id
+			if(StringUtils.isNotBlank(imageFileIds)){
+				objectDao.executeUpdate("update " + ImageFile.class.getSimpleName() + " set objectId='"+ tousseDefinition.getId() 
+						+"' where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", Arrays.asList(imageFileIds.split(","))));
+			}
 			
 			obj.put("tousseDefinitionId", tousseDefinition.getId());
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r24769 -r24791
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 24769)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 24791)
@@ -290,6 +290,8 @@
 var imageType_packingTeaching = '<%=ImageFile.IMAGE_TYPE_TOUSSEPACKING%>';
 var imageType_qualitymonitoring = '<%=ImageFile.IMAGE_TYPE_QUALITYMONITORING%>';
 var imageType_specification = '<%=ImageFile.IMAGE_TYPE_SPECIFICATION%>';
+var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
+var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
 
 var IMAGE_TYPE_MATERIAL_DETACHABLE = '<%=ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE%>';
 var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>';