Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ComboTousseInvoiceTests.java
===================================================================
diff -u -r16935 -r16941
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ComboTousseInvoiceTests.java	(.../ComboTousseInvoiceTests.java)	(revision 16935)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ComboTousseInvoiceTests.java	(.../ComboTousseInvoiceTests.java)	(revision 16941)
@@ -173,8 +173,8 @@
 		Invoice invoice = (Invoice)objectDao.getByProperty(Invoice.class.getSimpleName(), "invoicePlan.serialNumber", "2014021100001");
 		assertNotNull(invoice);
 		
-		//断言发货单关联的包实例为4个（ Test开胸包2个 + Test开颅包1个  + 自己）
-		assertEquals(4 , invoice.getTousseInstances(objectDao).size());
+		//断言发货单关联的包实例为3个
+		assertEquals(3 , invoice.getTousseInstances(objectDao).size());
 		
 		//断言器械包状态为已发货
 		TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceByBarcode(barcodeArray_开胸包[0]);
@@ -359,8 +359,8 @@
 		Invoice invoice = (Invoice)objectDao.getByProperty(Invoice.class.getSimpleName(), "invoicePlan.serialNumber", "2014021100001");
 		assertNotNull(invoice);
 		
-		//断言发货单关联的包实例为4个（Test开胸包2个 + Test开颅包1个 + 自己 ）
-		assertEquals(4 , invoice.getTousseInstances(objectDao).size());
+		//断言发货单关联的包实例为3个
+		assertEquals(3 , invoice.getTousseInstances(objectDao).size());
 		
 		//断言器械包状态为已发货
 		TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceByBarcode(barcodeArray_开胸包[0]);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r16933 -r16941
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16933)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16941)
@@ -3447,7 +3447,7 @@
 				if(comboTousseInstance == null){
 					throw new RuntimeException(String.format("id为%s的聚合包实例已不存在!",tousseInstance.getComboTousseInstanceId()));
 				}
-				comboTousseInstance.setInvoice_id(invoice.getId());
+//				comboTousseInstance.setInvoice_id(invoice.getId()); 一个聚合包实例可能对应多个发货单,所以不能只记一个id
 				comboTousseInstance.setStatus(TousseInstance.STATUS_SHIPPED);
 				comboTousseInstance.setLocation(departCoding);
 				comboTousseInstance.setLocationForDisplay(depart);