Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
===================================================================
diff -u -r15892 -r15899
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 15892)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 15899)
@@ -73,7 +73,10 @@
 	private Boolean isUnqualified = false;
 	
 	private Long invoicePlanID = null;
+	private Long proxyDisinfection_id = null;
 	
+	
+	
 	public Long getId() {
 		return id;
 	}
@@ -281,5 +284,13 @@
 	public void setInvoicePlanID(Long invoicePlanID) {
 		this.invoicePlanID = invoicePlanID;
 	}
+
+	public Long getProxyDisinfection_id() {
+		return proxyDisinfection_id;
+	}
+
+	public void setProxyDisinfection_id(Long proxyDisinfection_id) {
+		this.proxyDisinfection_id = proxyDisinfection_id;
+	}
 	
 }
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15892 -r15899
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15892)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15899)
@@ -3344,6 +3344,7 @@
 		String goodsName = tousseInstance.getTousseDefinition()
 				.getName();
 		result.addProperty("invoicePlanID", tousseInstance.getInvoicePlanID());
+		result.addProperty("proxyDisinfection_id", tousseInstance.getProxyDisinfection_id());
 		result.addProperty("tousseName", goodsName);
 		result.addProperty("showTousseName", goodsName);
 		result.addProperty("barcode", tousseInstance.getBarcode());
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15892 -r15899
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15892)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15899)
@@ -1455,6 +1455,7 @@
 			if(data.has("invoicePlanID")){
 				vo.setInvoicePlanID(data.get("invoicePlanID").getAsLong());
 			}
+			vo.setProxyDisinfection_id(data.get("proxyDisinfection_id").getAsLong());
 			vo.setPrice(String.valueOf(data.get("price").getAsDouble()));
 			vo.setFluctuationPrice(String.valueOf(data.get("fluctuationPrice").getAsDouble()));
 			JsonElement ele = data.get("sterileEndTime");
@@ -1490,6 +1491,7 @@
 				if(data.has("invoicePlanID")){
 					vo.setInvoicePlanID(data.get("invoicePlanID").getAsLong());
 				}
+				vo.setProxyDisinfection_id(data.get("proxyDisinfection_id").getAsLong());
 				vo.setPrice(String.valueOf(data.get("price").getAsDouble()));
 				vo.setFluctuationPrice(String.valueOf(data.get("fluctuationPrice").getAsDouble()));
 				JsonElement ele = data.get("sterileEndTime");
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r15892 -r15899
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15892)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15899)
@@ -497,16 +497,20 @@
 					showResult(msg);
 					continue;
 				}
-				if(goods.tousseType == '外部代理灭菌' && !goods.tousseFixedBarcode){
+				if((goods.tousseType == '外部代理灭菌' || goods.tousseType == '外来器械包' || goods.tousseType == '外来器械拆分小包' || goods.proxyDisinfection_id) && !goods.tousseFixedBarcode){
 					var inPlan = false;
 					for(var i=0;i<record.data.invoicePlanIDList.length;++i){
-						if(goods.invoicePlanID == record.data.invoicePlanIDList[i]){
+						var invoicePlanID = goods.invoicePlanID;
+						if(goods.proxyDisinfection_id){
+							invoicePlanID = goods.proxyDisinfection_id;
+						}
+						if(invoicePlanID == record.data.invoicePlanIDList[i]){
 							inPlan = true;
 							break
 						}
 					}
 					if(!inPlan){
-						showResult('请扫描发货计划申请单对应的外部代理灭菌包条码!');
+						showResult('请扫描发货计划申请单对应的器械包条码!');
 						continue;
 					}
 				}