Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r40452 -r40456
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40452)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40456)
@@ -2639,6 +2639,34 @@
 			id : 'easyToSecondRecyclingBtn',
 			hidden:true,
 			handler : function() {
+				var tree = top.Ext4.getCmp('foreignTousseTreeGridForm');
+				var selNodes = tree.getView().getChecked();
+				if(selNodes.length == 0){
+					showResult('请选择一套外来器械包！');
+					return;
+				}
+				var msg = '';
+				for(var i=0;i<selNodes.length;i++){
+					var packageStatus = selNodes[i].data.packageStatus;
+					if (packageStatus.indexOf('待二次回收') >= 0 && (recyclingStatus == '待回收' || recyclingStatus == '部分回收') && deliverStatus == '已发货') {
+						break;
+					}else if((packageStatus.indexOf('已发货') >= 0 || packageStatus.indexOf('已签收') >= 0 || packageStatus.indexOf('已使用') >= 0) && (recyclingStatus == '已接收' || recyclingStatus == '待回收' || recyclingStatus == '部分回收') && deliverStatus == '已发货'){
+						if(sstsConfig.enableSecondRecyclingAfterInvoiceFunction){
+							break;
+						}else {
+							msg = '需要回收状态为“待回收”或“部分回收”且发货状态为“已发货”才能快捷二次回收。';
+							break;
+						}
+					}else {
+						msg = '需要回收状态为“待回收”或“部分回收”且发货状态为“已发货”才能快捷二次回收。';
+						break;
+					}
+				}
+				if(msg !== ''){
+					showResult(msg);
+					return;
+				}
+
 				Ext.Ajax.request({
 					url: WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!allowForeignTousseApplicationEasySecondRecycling.do',
 					params: {
@@ -4990,11 +5018,12 @@
 				top.Ext4.getCmp("hiddenReturnTime").setValue(action.result.data.returnTime);
 
 				if (sstsConfig.enableEasyToSecondRecycling) {
-					if (action.result.data.recyclingStatus == '待回收' && action.result.data.deliverStatus == '已发货') {
-						top.Ext4.getCmp('easyToSecondRecyclingBtn').show();
-					}else if(action.result.data.recyclingStatus == '已接收' && action.result.data.deliverStatus == '已发货' && sstsConfig.enableSecondRecyclingAfterInvoiceFunction){
-						top.Ext4.getCmp('easyToSecondRecyclingBtn').show();
+					var endStatus = action.result.data.endStatus;
+					var recyclingStatus = action.result.data.recyclingStatus;
+					if(endStatus == '已终止'){
+						return
 					}
+					top.Ext4.getCmp('easyToSecondRecyclingBtn').show();
 				}
 
 				if (!SSTS_ForeignTousseApplication_Update && sstsConfig.enableForeignTousseUsedAgainFunction) {