Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
===================================================================
diff -u -r15707 -r15892
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 15707)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 15892)
@@ -72,8 +72,8 @@
 	 */
 	private Boolean isUnqualified = false;
 	
+	private Long invoicePlanID = null;
 	
-	
 	public Long getId() {
 		return id;
 	}
@@ -273,5 +273,13 @@
 	public void setIsUnqualified(Boolean isUnqualified) {
 		this.isUnqualified = isUnqualified;
 	}
+
+	public Long getInvoicePlanID() {
+		return invoicePlanID;
+	}
+
+	public void setInvoicePlanID(Long invoicePlanID) {
+		this.invoicePlanID = invoicePlanID;
+	}
 	
 }
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15734 -r15892
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15734)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15892)
@@ -1452,6 +1452,9 @@
 			if(vo.getTousseFixedBarcode()){
 				vo.setStorage(data.get("stockForFixedBarcode").getAsString());
 			}
+			if(data.has("invoicePlanID")){
+				vo.setInvoicePlanID(data.get("invoicePlanID").getAsLong());
+			}
 			vo.setPrice(String.valueOf(data.get("price").getAsDouble()));
 			vo.setFluctuationPrice(String.valueOf(data.get("fluctuationPrice").getAsDouble()));
 			JsonElement ele = data.get("sterileEndTime");
@@ -1483,6 +1486,10 @@
 				vo.setName(data.get("tousseName").getAsString());
 				vo.setShowTousseName(data.get("showTousseName").getAsString());
 				vo.setStorage("1");
+				vo.setTousseType(data.get("tousseType").getAsString());
+				if(data.has("invoicePlanID")){
+					vo.setInvoicePlanID(data.get("invoicePlanID").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 -r15752 -r15892
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15752)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15892)
@@ -497,6 +497,19 @@
 					showResult(msg);
 					continue;
 				}
+				if(goods.tousseType == '外部代理灭菌' && !goods.tousseFixedBarcode){
+					var inPlan = false;
+					for(var i=0;i<record.data.invoicePlanIDList.length;++i){
+						if(goods.invoicePlanID == record.data.invoicePlanIDList[i]){
+							inPlan = true;
+							break
+						}
+					}
+					if(!inPlan){
+						showResult('请扫描发货计划申请单对应的外部代理灭菌包条码!');
+						continue;
+					}
+				}
 				//申请数量
 				var appAmount1 = record.data['count'];
 				var sendAmount1 = record.data['tempAmount'];
@@ -714,6 +727,7 @@
 		    {name : 'applicationAmount'},
 		    {name : 'batchNumber'},
 		    {name : 'disposableGoodsIdSet'},
+		    {name : 'invoicePlanIDList'},
 		    {name : 'invoicePlanType'}
 		]
 	});
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15874 -r15892
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15874)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15892)
@@ -3343,6 +3343,7 @@
 		JsonObject result = new JsonObject();
 		String goodsName = tousseInstance.getTousseDefinition()
 				.getName();
+		result.addProperty("invoicePlanID", tousseInstance.getInvoicePlanID());
 		result.addProperty("tousseName", goodsName);
 		result.addProperty("showTousseName", goodsName);
 		result.addProperty("barcode", tousseInstance.getBarcode());
@@ -3380,9 +3381,9 @@
 			// 非整包清洗的消毒物品，显示材料数量
 			result.addProperty("materialAmount", CssdUtils.getMaterialTotalAmount(td,false));
 		}
+		result.addProperty("tousseFixedBarcode", tousseInstance.getTousseFixedBarcode());
 		if(tousseInstance.getTousseFixedBarcode()){
 			// 固定条码，增加库存属性
-			result.addProperty("tousseFixedBarcode", tousseInstance.getTousseFixedBarcode());
 			result.addProperty("stockForFixedBarcode", tousseInstance.getStockForFixedBarcode());
 			result.addProperty("storage", tousseInstance.getStockForFixedBarcode());
 		}