Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r27812 -r27953
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 27812)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 27953)
@@ -2097,7 +2097,11 @@
 				vo.setScanAmount(data.get("scanAmount").getAsInt());
 				vo.setTousseType(data.get("tousseType").getAsString());
 				vo.setInvoicePlanID(JSONUtil.optLong(data,"invoicePlanID",null));
-				vo.setProxyDisinfection_id(JSONUtil.optLong(data,"proxyDisinfection_id",null));
+				//如果有发货单id了,则不再返回代理灭菌单id(解决ZSWY-113 临床呼吸机管道无法发货的问题)
+				Long invoice_id = JSONUtil.optLong(data,"invoice_id",null);
+				if(!DatabaseUtil.isPoIdValid(invoice_id)){
+					vo.setProxyDisinfection_id(JSONUtil.optLong(data,"proxyDisinfection_id",null));
+				}
 				vo.setMaterialAmount(JSONUtil.optInt(data,"materialAmount",0));
 				vo.setMaterialsMD5(JSONUtil.optString(data,"materialsMD5",null));
 				vo.setPrice(String.valueOf(data.get("price").getAsDouble()));
@@ -2195,7 +2199,11 @@
 		vo.setScanAmount(data.get("scanAmount").getAsInt());
 		vo.setInvoicePlanID(JSONUtil.optLong(data,"invoicePlanID",null));
 		vo.setTousseDefinitionId(JSONUtil.optString(data,"tousseDefinitionId",null));
-		vo.setProxyDisinfection_id(JSONUtil.optLong(data,"proxyDisinfection_id",null));
+		//如果有发货单id了,则不再返回代理灭菌单id(解决ZSWY-113 临床呼吸机管道无法发货的问题)
+		Long invoice_id = JSONUtil.optLong(data,"invoice_id",null);
+		if(!DatabaseUtil.isPoIdValid(invoice_id)){
+			vo.setProxyDisinfection_id(JSONUtil.optLong(data,"proxyDisinfection_id",null));
+		}
 		vo.setProxyDisinfectionSent(JSONUtil.optString(data,"proxyDisinfectionSent",null));
 		vo.setMaterialAmount(JSONUtil.optInt(data,"materialAmount",0));
 		vo.setMaterialsMD5(JSONUtil.optString(data,"materialsMD5",null));
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r27812 -r27953
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 27812)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 27953)
@@ -5342,6 +5342,7 @@
 				.getName();
 		result.addProperty("invoicePlanID", tousseInstance.getInvoicePlanID());
 		result.addProperty("proxyDisinfection_id", tousseInstance.getProxyDisinfection_id());
+		result.addProperty("invoice_id", tousseInstance.getInvoice_id());
 		result.addProperty("proxyDisinfectionSent", tousseInstance.getProxyDisinfectionSent());
 		result.addProperty("tousseName", goodsName);
 		result.addProperty("showTousseName", goodsName);
@@ -5914,7 +5915,7 @@
 					JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
 					result.add("data", dataJSONObject);
 					logScannedTousse(dataJSONObject);
-						return result;
+					return result;
 				}
 	
 				// 不追溯的器械包（除消毒物品外），发货扫描固定条码，返回多个器械包