Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r29879 -r29881
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29879)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29881)
@@ -77,7 +77,7 @@
 		}
 		//2、设置“提交并新建”按钮重新打开表单的参数对象
 	    setOpenFormObj(form, tousseGroups, specifyDisposableTypes);
-		comboApplication(0,dirOrgCode,currentOrgUnitName,false,false,true,form, tousseGroups, specifyDisposableTypes, false, '', null);
+		comboApplication(0,dirOrgCode,currentOrgUnitName,false,false,true,form, tousseGroups, specifyDisposableTypes, false, '', null,0);
 	}
 }
 
@@ -164,7 +164,7 @@
 		function(button, text) {
 			if ("yes" == button){
 				actionType = true;
-				comboApplication(0,dirOrgCode,currentOrgUnitName,false,false,true,tousseApplicationForm, null, null, false, '', null);
+				comboApplication(0,dirOrgCode,currentOrgUnitName,false,false,true,tousseApplicationForm, null, null, false, '', null,0);
 				Ext.Ajax.request({
 					url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!getTousseItemListByInvoicePlanIds.do',
 					params : {ids : ids},
@@ -1822,14 +1822,14 @@
 function setRecyclingApplicationForm(tempRecyclingApplication){
 	if(tempRecyclingApplication){
 		var recyclingApplication = Ext.util.JSON.decode(tempRecyclingApplication);
-		
 		var deliverStatus = recyclingApplication.deliverStatus;
 		var recyclingStatus = recyclingApplication.recyclingStatus;
 		var committedStatus = recyclingApplication.committedStatus;
 		var endStatus = recyclingApplication.endStatus;
 		var printed = recyclingApplication.printed;
 		var type = recyclingApplication.type;
 		var isReaded = false;
+		var version = recyclingApplication.version;
 		if(recyclingApplication.readed == 1){
 			isReaded = true;
 		}
@@ -1892,7 +1892,7 @@
 				|| type == reservateionApplicationForm){
 			comboApplication(recyclingApplication.id,recyclingApplication.departCoding,recyclingApplication.depart,hiddenCommitButton,hiddenSaveButton,
 					hiddenReturnButton,type, '', specifyDisposableTypes,recyclingApplication.committedStatus,
-					recyclingApplication.handleDepartCoding,recyclingApplication);
+					recyclingApplication.handleDepartCoding,recyclingApplication,version);
 		}
 	}else{
 		showResult('加载出错，请联系统管理员！');
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r29852 -r29881
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29852)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29881)
@@ -516,7 +516,7 @@
 						form.form.submit({
 							url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!saveRecyclingApplication.do',
 							method : 'POST',
-							params:{committedStatus:false},//给定一个参数，指定其状态是未提交
+							params:{committedStatus:false,oldVersion:oldVersion},//给定一个参数，指定其状态是未提交
 							waitMsg : '正在保存数据，请稍候',
 							waitTitle : '保存表单',
 							success : function(form, action) {