Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
===================================================================
diff -u -r21816 -r22266
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java	(.../UploadImageFileAction.java)	(revision 21816)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java	(.../UploadImageFileAction.java)	(revision 22266)
@@ -152,6 +152,7 @@
 	public void uploadImage() {
 		objectID = StrutsParamUtils.getPraramValue("objectId", null);
 		objectType = StrutsParamUtils.getPraramValue("imageType", null);
+		String expensiveGoodsSupplierId = StrutsParamUtils.getPraramValue("expensiveGoodsSupplierId",null);
 		JSONObject json = JSONUtil.buildJsonObject(true, "上传成功！");
 		boolean isSavePathExist = supplyRoomConfigManager.isSavePathExist();
 		if (isSavePathExist == false) {
@@ -180,6 +181,9 @@
 							image.setImage(outStream.toByteArray());
 							image.setImageType(objectType);
 							image.setObjectId(objectID);
+							if(expensiveGoodsSupplierId != null){
+							   image.setExpensiveGoodsSupplierId(Long.parseLong(expensiveGoodsSupplierId));
+							}
 							image.setImageName(uploadFilesFileName[i]);
 							uploadImageList.add(image);
 						} catch (Exception e) {
@@ -216,6 +220,16 @@
 		StrutsResponseUtils.output(json);
 	}
 	
+	private String typeof(String expensiveGoodsSupplierId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	private String TypeOf(String expensiveGoodsSupplierId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	public void deleteImageFile(){
 		String id = StrutsParamUtils.getPraramValue("id", null);
 		ImageFile image = imageFileManager.getImageFileById(id);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js
===================================================================
diff -u -r13789 -r22266
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js	(.../uploadImageManager.js)	(revision 13789)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js	(.../uploadImageManager.js)	(revision 22266)
@@ -47,10 +47,11 @@
     }
 }
 
-function uploadWindow(imageType,id){
+function uploadWindow(imageType,id,expensiveGoodsSupplierId){
+	expensiveGoodsSupplierId = expensiveGoodsSupplierId?expensiveGoodsSupplierId:'';
     var dialog = new top.Ext.ux.UploadDialog.Dialog({    
          title: "上传" + imageType,    
-         url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage.do?imageType='+imageType+'&objectId='+id , //这里我用struts2做后台处理   
+         url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage.do?imageType='+imageType+'&objectId='+id+'&expensiveGoodsSupplierId='+expensiveGoodsSupplierId , //这里我用struts2做后台处理   
          post_var_name:'uploadFiles',//这里是自己定义的，默认的名字叫file   
          width : 450,    
          height : 300,    
@@ -95,7 +96,7 @@
 }
 
 
-function uploadToussePackingImageFile(imageType,id){
+function uploadToussePackingImageFile(imageType,id,expensiveGoodsSupplierId){
     toussePackingTearchingStore = new top.Ext.data.Store({
             proxy : new Ext.data.HttpProxy({
                 url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType='+encodeURI(imageType)+'&objectId='+id ,
@@ -142,7 +143,7 @@
         var tbar = [{
             text : '上传图片',
             handler:function(){
-                uploadWindow(imageType,id);
+                uploadWindow(imageType,id,expensiveGoodsSupplierId);
             }
         }];