Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r33207 -r33211
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33207)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33211)
@@ -169,8 +169,10 @@
 				
 				tousseInstanceManager.save(ti);
 			}
-			//重新获取代理灭菌单的发货状态
+			//重新获取代理灭菌单的接收状态
 			setProxyDisinfectionReceiveStatus(proxyDisinfection, tousseInstanceList);
+			//重新获取代理灭菌单的发货状态
+			invoicePlanManager.computeAndSetInvoiceStatus(proxyDisinfection);
 			//计算代理灭菌单物品tousseItem已接收数量GDSZYY-131
 			setProxyDisinfectionReceiveAmount(proxyDisinfection, tousseInstanceList);
 			proxyDisinfection.setTotalAmountOfTousses(tousseInstanceList.size());
@@ -281,8 +283,7 @@
 			JSONArray basketInfos,String loginUserName,String loginUserCode, String loginUserOrgUnitCode) {
 		//处理PDA端在发货前打开，发货后再保存问题。
 		if (proxyDisinfection != null) {
-			if (proxyDisinfection.partDelivered()
-					|| proxyDisinfection.delivered()
+			if (proxyDisinfection.delivered()
 					|| proxyDisinfection.deliverEnd()) {
 				return null;
 			}
@@ -334,6 +335,20 @@
 			}
 		}
 		
+		//篮筐外的器械包都删除
+		if(ArrayUtils.isEmpty(tousseInstanceIdStrs) && CollectionUtils.isNotEmpty(oldTousseInstances)){
+			for (TousseInstance ti : oldTousseInstances) {
+				ti.setProxyDisinfection_id(null);
+				ti.setHasReceived(null);
+				objectDao.save(ti);
+				if(StringUtils.isBlank(remark)){
+					remark += loginUserName + "删除了" + ti.getBarcode() + ti.getTousseName();
+				}else{
+					remark += "，" + loginUserName + "删除了" + ti.getBarcode() + ti.getTousseName();
+				}
+			}
+		}
+		
 		// 2、处理篮筐和篮筐中的器械包信息
 		List<ReviewedBasket> oldBaskets = proxyDisinfection.getReviewedBaskets();
 		if (basketInfos != null && !basketInfos.isEmpty()) {
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r33163 -r33211
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33163)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33211)
@@ -3457,6 +3457,13 @@
 			invoicePlan.setReturnStatus(InvoicePlan.STATUS_END);
 		}
 		invoicePlan.setEndStatus(InvoicePlan.STATUS_END);
+		if(invoicePlan instanceof ProxyDisinfection){
+			//对于后面二级供应室在历史装配记录里生成代理灭菌单按钮产生的代理灭菌单，点击终止后，【接收状态】要变为已终止。GDSZYY-131
+			ProxyDisinfection proxyDisinfection = (ProxyDisinfection) invoicePlan;
+			if(StringUtils.isNotBlank(proxyDisinfection.getReceiveStatus())){
+				proxyDisinfection.setReceiveStatus(InvoicePlan.STATUS_END);
+			}
+		}
 	}
 	/**
 	 * 终止多个申请单(同步方法)