Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r21213 -r21255
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 21213)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 21255)
@@ -862,7 +862,7 @@
  *            审核状态
  * @return
  */
-function addAndEditUseRecord(id, status) {
+function addAndEditUseRecord(id, status,recyclingStatus) {
 	currentUseRecordId = id;
 	useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank',true);
 	useItemsStore.removeAll();
@@ -892,7 +892,10 @@
 	var createApplicationBtn = {
 			text : '生成申请单',
 			handler : function() {
-
+				if((recyclingStatus == "已回收" || recyclingStatus == "部分回收") && sstsConfig.monitorGoodsRecyclingStatusForUseRecord){
+					showResult('不能生成申请单,请确认该条记录为未回收状态或空');
+					return;
+				}
 				var operatorStr = top.Ext.getCmp('operator').getValue();
 				var departStr = top.Ext.getCmp('depart').getValue();
 				var departCodingStr = top.Ext.getCmp('departCoding').getValue();
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r21208 -r21255
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 21208)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 21255)
@@ -9,7 +9,7 @@
 var setRecyclingStatusName = sstsConfig.monitorGoodsRecyclingStatusForUseRecord ?"设置已回收":""
 
 function newUseRecord(){
-	addAndEditUseRecord('', '');
+	addAndEditUseRecord('', '','');
 	setTimeout("top.Ext.getCmp('hospitalNum').focus(true)", 500);
 }
 
@@ -224,7 +224,8 @@
 function renderCallModifyFunction(v, p, record) {
 	var data = record.data;
 	return "<a href=\"#\" onclick=\"addAndEditUseRecord(" + data['id'] + ",'"
-			+ data['status'] + "');return false;\">" + v + "</a>";
+	+ data['status'] + "','"+data['recyclingStatus']+"');return false;\">" + v + "</a>";
+	
 }
 
 function rendererColor(v, p, record) {
@@ -254,9 +255,9 @@
 					+ '”的使用记录不能生成申请单,请确认使用记录已审核且未转化成申请单');
 			return false;
 		}
-		if((records[i].data['recyclingStatus'] == '已回收' || records[i].data['recyclingStatus'] == '部分回收') && sstsConfig.monitorGoodsRecyclingStatusForUseRecord){
+		if((records[i].data['recyclingStatus'] == "已回收" || records[i].data['recyclingStatus'] == '部分回收') && sstsConfig.monitorGoodsRecyclingStatusForUseRecord){
 			showResult('病人名称为[' + records[i].data['patientName']
-			+ ']的使用记录不能生成申请单,请确认该条记录为未回收状态');
+			+ ']的记录不能生成申请单,请确认该条记录为未回收状态或空');
 			return false;
 		}
 		if (ids == null) {
@@ -484,7 +485,7 @@
 				return false;
 			}
 			var d = records[0];
-			addAndEditUseRecord(d.data['id'], d.data['status']);
+			addAndEditUseRecord(d.data['id'],d.data['status'],d.data['recyclingStatus']);
 		}
 	}, '-', {
 		text : '删除',
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r21253 -r21255
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 21253)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 21255)
@@ -3678,7 +3678,7 @@
 			if(monitorGoodsRecyclingStatusForUseRecord && useRecord.recyclingStatus_partOrAll()){
 				String message = null;
 				if(org.apache.commons.lang3.StringUtils.isNotBlank(useRecord.getPatientName())){
-					message = String.format("病人名称为[%s]的使用记录不能生成申请单,请确认该条记录为未回收状态",useRecord.getPatientName());
+					message = String.format("病人名称为[%s]的使用记录不能生成申请单,请确认该条记录为未回收状态或空",useRecord.getPatientName());
 				}else{
 					message = String.format("使用记录状态为%s,不能转换",useRecord.getStatus());
 				}