Index: ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/print/printConfig.js
===================================================================
diff -u -r12331 -r13027
--- ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/print/printConfig.js	(.../printConfig.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/print/printConfig.js	(.../printConfig.js)	(revision 13027)
@@ -42,8 +42,8 @@
             {label : "提交时间:", dataIndex : 'applicationTime'}
         ]
     },
-	barcodes : [
-				{codeType : "128Auto", dataIndex : 'serialNum', position : ["0","65%",210,30],
+    barcodes : [
+				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["0","65%",210,30],
 					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
 					          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
 					          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r13025 -r13027
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13025)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13027)
@@ -2694,8 +2694,19 @@
 					if (!inPlan)
 						return buildErrorMsgJsonResult("此物品不在发货计划内");
 	
-					long tousseInstanceAmount = getDisinfectionTousseInstanceAmount(
-							departCodeOfInvoicePlan, tousseDefinition);
+					long tousseInstanceAmount = 0;
+					switch(mode){
+					case "depart":
+						tousseInstanceAmount = getDisinfectionTousseInstanceAmount(
+								departCodeOfInvoicePlan, tousseDefinition);
+						break;
+					case "invoicePlan":
+						tousseInstanceAmount = getDisinfectionTousseInstanceAmountByInvoicePlanId(
+								invoicePlanId, tousseDefinition);
+						break;
+					default:
+						return buildErrorMsgJsonResult("extraParam缺失参数mode");
+					}
 					
 					if (tousseInstanceAmount <= 0)
 						return buildErrorMsgJsonResult("该物品库存不足");
@@ -3041,8 +3052,19 @@
 				if (tousseInstance.getTousseFixedBarcode()
 						&& TousseDefinition.PACKAGE_TYPE_DISINFECTION
 								.equals(tousseDefinition.getTousseType())) {
-					long tousseInstanceAmount = getDisinfectionTousseInstanceAmount(
-							departCodeOfInvoicePlan, tousseDefinition);
+					long tousseInstanceAmount = 0;
+					switch(mode){
+					case "depart":
+						tousseInstanceAmount = getDisinfectionTousseInstanceAmount(
+								departCodeOfInvoicePlan, tousseDefinition);
+						break;
+					case "invoicePlan":
+						tousseInstanceAmount = getDisinfectionTousseInstanceAmountByInvoicePlanId(
+								invoicePlanId, tousseDefinition);
+						break;
+					default:
+						return buildErrorMsgJsonResult("extraParam缺失参数mode");
+					}
 					
 					if (tousseInstanceAmount <= 0)
 						return buildErrorMsgJsonResult("该物品库存不足");
@@ -3323,6 +3345,21 @@
 		return result;
 	}
 	// 获取待发货消毒物品的数量
+	public long getDisinfectionTousseInstanceAmountByInvoicePlanId(
+			Long invoicePlanId, TousseDefinition tousseDefinition) {
+		if (!TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition
+				.getTousseType()))
+			return 0;
+		if (!TousseDefinition.STR_NO.equals(tousseDefinition.getIsTraceable()))
+			return 0;
+		String sql = " where po.id=" + invoicePlanId;
+		List<InvoicePlan> invoicePlans = (List<InvoicePlan>)objectDao.findBySql(InvoicePlan.class.getSimpleName(),sql);
+		long result = getDisinfectionTousseInstanceAmount(invoicePlans,
+				tousseDefinition);
+		return result;
+	}
+	
+	// 获取待发货消毒物品的数量
 	public long getDisinfectionTousseInstanceAmount(
 			String orgUnitCoding, TousseDefinition tousseDefinition) {
 		if (!TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition