Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14016 -r14048
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14016)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14048)
@@ -2619,7 +2619,7 @@
 		Collection<String> sqlWheres = new ArrayList<String>();
 		// 判断状态
 		sqlWheres.add(SqlBuilder.build_IN_Statement("po.status",
-				SqlBuilder.IN, TousseInstance.STATUS_STERILED,
+				SqlBuilder.IN, TousseInstance.STATUS_STERILED,TousseInstance.STATUS_DISINFECTED,
 				TousseInstance.STATUS_NO_DELIVER));
 		sqlWheres.add("po.tousseFixedBarcode = 0 ");
 		// 非可追溯器械包，返回多个器械包实例
@@ -2724,8 +2724,7 @@
 			if(StringUtils.isBlank(barcodeEnd)){
 				// 不追溯的消毒物品，发货扫描固定条码，返回多个器械包
 				if (tousseInstance.getTousseFixedBarcode()
-						&& TousseDefinition.PACKAGE_TYPE_DISINFECTION
-								.equals(tousseDefinition.getTousseType())) {
+						&& tousseDefinition.isDisinfection()) {
 					long tousseInstanceAmount = 0;
 					switch(mode){
 					case "depart":
@@ -2743,18 +2742,18 @@
 					if (tousseInstanceAmount <= 0)
 						return buildErrorMsgJsonResult("该物品库存不足");
 	
-				tousseInstance.setStockForFixedBarcode(new Long(tousseInstanceAmount));
-				JsonObject result = new JsonObject();
-				result.addProperty("success", true);
-				result.addProperty("barcode", barcode);
-				result.addProperty("type", "tousseInstance");
-				result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
-//				result.addProperty("type", "tousseInstanceList");
-//				result.add("fixedBarcodeInfo", getFixedBarcodeInfo(tousseInstance, resultTousseInstanceList));
-//				result.add(
-//						"data",
-//						buildJSONArrayForTousseInstances(resultTousseInstanceList));
-					return result;
+					tousseInstance.setStockForFixedBarcode(new Long(tousseInstanceAmount));
+					JsonObject result = new JsonObject();
+					result.addProperty("success", true);
+					result.addProperty("barcode", barcode);
+					result.addProperty("type", "tousseInstance");
+					result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
+		//				result.addProperty("type", "tousseInstanceList");
+		//				result.add("fixedBarcodeInfo", getFixedBarcodeInfo(tousseInstance, resultTousseInstanceList));
+		//				result.add(
+		//						"data",
+		//						buildJSONArrayForTousseInstances(resultTousseInstanceList));
+						return result;
 				}
 	
 				// 不追溯的器械包（除消毒物品外），发货扫描固定条码，返回多个器械包