Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r32469 -r32470
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 32469)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 32470)
@@ -115,9 +115,6 @@
 		ProxyDisinfection proxyDisinfection = get(id);
 		proxyDisinfection.setReviewedBaskets(null);
 		objectDao.delete(proxyDisinfection);
-		// 删除生成改代理灭菌单的装配记录上面的代理灭菌单ID
-		String sql = String.format("update %s set InvoiceplanId = null where id = %s", PackingRecord.class.getSimpleName(), id);
-		objectDao.excuteSQL(sql);
 	}
 
 	@Override
@@ -737,16 +734,22 @@
 						&& StringUtils.equals(proxyDisinfection.getHandleDepartCoding(), AcegiHelper.getCurrentOrgUnitCode()) 
 						&& isAwaitReceive){
 					if(isProxyed){
-						// 核对器械包实例GDSZYY-102(一级供应室用户登录，打开待接收的代理灭菌，扫描了单上已经存在的物品时，就是审核物品)
-						//checkProxyDisinfectionTousse(tousseInstance.getId(), proxyDisinfectionId);
-						json.put("id", tousseInstance.getId());
-						json.put("name", tousseInstance.getTousseDefinition().getName());
-						json.put("produceDeptCode", tousseInstance.getOrgUnitCoding());
-						json.put("produceDeptName", tousseInstance.getOrgUnitName());
-						json.put("status", tousseInstance.getStatus());
-						json.put("type", BarcodeDevice.BARCODE_TYPE_PACKAGE);
-						json.put("receiveTousse", true);
-						success = true;
+						if(tousseInstance.getProxyDisinfection_id().equals(Long.valueOf(proxyDisinfectionId))){
+							// 核对器械包实例GDSZYY-102(一级供应室用户登录，打开待接收的代理灭菌，扫描了单上已经存在的物品时，就是审核物品)
+							//checkProxyDisinfectionTousse(tousseInstance.getId(), proxyDisinfectionId);
+							json.put("id", tousseInstance.getId());
+							json.put("name", tousseInstance.getTousseDefinition().getName());
+							json.put("produceDeptCode", tousseInstance.getOrgUnitCoding());
+							json.put("produceDeptName", tousseInstance.getOrgUnitName());
+							json.put("status", tousseInstance.getStatus());
+							json.put("type", BarcodeDevice.BARCODE_TYPE_PACKAGE);
+							json.put("receiveTousse", true);
+							success = true;
+						}else{
+							// 已经申请代理灭菌，不能重复申请。
+							message = barcode + tousseInstance.getTousseName() + "已经申请代理灭菌，不能重复申请。";;
+							success = false;
+						}
 					}else{
 						// 核对器械包实例(一级供应室用户登录，打开待接收的代理灭菌，扫描了单上不存在的物品时，提示“012454097缝合包未生成代理灭菌单，请联系XX科室！”)
 						message = barcode + tousseInstance.getTousseName() + "未生成代理灭菌单，请联系" + tousseInstance.getOrgUnitName() + "！";