Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r29145 -r29184
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 29145)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 29184)
@@ -3409,7 +3409,10 @@
 					//看是否已经回收,可能未回收（部分回收的情况）
 					RecyclingItem ri = findRecyclingItem(recyclingRecord, tousseDefinitionID);
 					if(ri != null){
-						throw new RuntimeException(tousseName + "已装配，不能修改加急数量！");
+						if(urgentTousseItem.getModified() != null && urgentTousseItem.getModified()){
+							throw new RuntimeException(tousseName + "已装配，不能修改加急数量！");
+						}
+						urgentAmount = 0;
 					}else{
 						throw new RuntimeException(tousseName + "未回收，不能修改加急数量！");
 					}
@@ -4267,6 +4270,11 @@
 									throw new RuntimeException(tousseName + ",加急数量不能大于回收数量！");
 								}
 							}
+							if(ri.getUrgentAmount() == null || (ri.getUrgentAmount().intValue() != urgentAmount)){
+								urgentTousseItem.setModified(true);
+							}else{
+								urgentTousseItem.setModified(false);
+							}
 							ri.setUrgentAmount(urgentAmount);
 							break;
 						}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UrgentTousseItem.java
===================================================================
diff -u -r26368 -r29184
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UrgentTousseItem.java	(.../UrgentTousseItem.java)	(revision 26368)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UrgentTousseItem.java	(.../UrgentTousseItem.java)	(revision 29184)
@@ -19,6 +19,10 @@
 	 * 加急等级
 	 */
 	private String urgentLevel;
+	/**
+	 * 加急数量经过修改(用于回收时判断已装配的器械包不能修改加急数量)
+	 */
+	private Boolean modified;
 	public String getTousseName() {
 		return tousseName;
 	}
@@ -45,5 +49,10 @@
 	public void setUrgentLevel(String urgentLevel) {
 		this.urgentLevel = urgentLevel;
 	}
-	
+	public Boolean getModified() {
+		return modified;
+	}
+	public void setModified(Boolean modified) {
+		this.modified = modified;
+	}	
 }