Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
===================================================================
diff -u -r21236 -r21238
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 21236)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 21238)
@@ -9,10 +9,10 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Index;
 import javax.persistence.Transient;
 
 import net.sf.json.JSONObject;
@@ -712,5 +712,12 @@
 		}
 		return jsonObject.toString();
 	}
+	/**
+	 * 判断是不是部分回收或者已回收
+	 * @return
+	 */
+	public boolean recyclingStatus_partOrAll(){
+		return RECYCLINGSTATUS_PARTRECYCLE.equals(recyclingStatus) || RECYCLINGSTATUS_RECYCLED.equals(recyclingStatus);
+	}
 	
 }
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r21100 -r21238
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 21100)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 21238)
@@ -1467,6 +1467,10 @@
 		Long useRecordId = useRecordManager.saveOrUpdateWithPDA(params);
 		UseRecord useRecord = useRecordManager.get(useRecordId);
 		if(useRecord != null){
+			boolean monitorGoodsRecyclingStatusForUseRecord = CssdUtils.getSystemSetConfigByNameBool("monitorGoodsRecyclingStatusForUseRecord");
+			if(monitorGoodsRecyclingStatusForUseRecord && useRecord.recyclingStatus_partOrAll()){
+				return JSONUtil.buildJsonObject(false, String.format("使用记录状态为%s,不能转换",useRecord.getRecyclingStatus())).toString();
+			}
 			String applicationFormType = CssdUtils.getSystemSetConfigByName("applicationFormType");
 			List<Long> ids = new ArrayList<>();
 			ids.add(useRecordId);
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r21236 -r21238
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 21236)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 21238)
@@ -912,6 +912,7 @@
 		
 		//对使用记录中新录入的器械包进行减少库存处理
 		tousseInstanceManager.adjustTousseGoodsStockByTousseInstanceList(useRecord.getDepartCoding(), needRegisterUseRecordTousseInstanceList, GoodsStockManager.MODE_OUTSTOCK);
+		recyclingApplicationManager.updateRecyclingStatus(useRecord.getId());
 		return true;
 	}