Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java
===================================================================
diff -u -r26651 -r33360
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java	(.../TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java)	(revision 26651)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java	(.../TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java)	(revision 33360)
@@ -75,6 +75,7 @@
 			tousseInstance.setFluctuationPrice(3.5);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(10);
 			tousseInstance.setPackageType("胶带");
 			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_DISINFECT);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
===================================================================
diff -u -r30566 -r33360
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java	(.../InvoiceManagerForComboFormTests.java)	(revision 30566)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java	(.../InvoiceManagerForComboFormTests.java)	(revision 33360)
@@ -80,6 +80,7 @@
 			tousseInstance1.setSterilingType("P1");
 			tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT);
+			tousseInstance1.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance1.setStatisticsAmount(1);
 			Date date = null;
 			try {
@@ -123,6 +124,7 @@
 			tousseInstance1.setSterilingType("P1");
 			tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT);
+			tousseInstance1.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance1.setStatisticsAmount(10);
 			tousseInstance1.setTousseFixedBarcode(true);
 			tousseInstance1.setUnTraceableTousse(true);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java
===================================================================
diff -u -r26651 -r33360
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java	(.../TestPDAForeignTousseGoodsInvoiceManager.java)	(revision 26651)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java	(.../TestPDAForeignTousseGoodsInvoiceManager.java)	(revision 33360)
@@ -81,6 +81,7 @@
 			tousseInstance.setFluctuationPrice(356.00);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_OR);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(10);
 			tousseInstance.setPackageType("纸塑");
 			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_OR);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java
===================================================================
diff -u -r26651 -r33360
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java	(.../TestPDADisinfectGoodsInvoiceManager.java)	(revision 26651)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java	(.../TestPDADisinfectGoodsInvoiceManager.java)	(revision 33360)
@@ -63,6 +63,7 @@
 			tousseInstance.setFluctuationPrice(3.5);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(10);
 			tousseInstance.setPackageType("胶带");
 			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_DISINFECT);
@@ -99,6 +100,7 @@
 			tousseInstance.setFluctuationPrice(3.5);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(10);
 			tousseInstance.setPackageType("胶带");
 			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_DISINFECT);
@@ -116,7 +118,7 @@
 		JSONArray invoiceItems1 = new JSONArray();
 		
 		JSONObject invoiceItems1_1 = new JSONObject();
-		invoiceItems1_1.put("barcode", "201410160001");
+		invoiceItems1_1.put("barcode", barcodeArray1[0]);
 		invoiceItems1_1.put("sendAmount", 3);
 		invoiceItems1_1.put("isRoutine", TousseInstance.ROUTINE_YES);
 		invoiceItems1.add(invoiceItems1_1);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java
===================================================================
diff -u -r26651 -r33360
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java	(.../TestMultiForeignTousseInvoiceManager.java)	(revision 26651)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java	(.../TestMultiForeignTousseInvoiceManager.java)	(revision 33360)
@@ -79,6 +79,7 @@
 			tousseInstance.setFluctuationPrice(356.00);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_OR);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(10);
 			tousseInstance.setPackageType("纸塑");
 			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_OR);
@@ -109,6 +110,7 @@
 			tousseInstance.setFluctuationPrice(356.00);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_OR);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(10);
 			tousseInstance.setPackageType("纸塑");
 			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_OR);
@@ -138,6 +140,7 @@
 			tousseInstance.setFluctuationPrice(356.00);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_OR);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(10);
 			tousseInstance.setPackageType("纸塑");
 			tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_OR);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignProxyTousseGoodsInvoiceManager.java
===================================================================
diff -u -r26651 -r33360
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignProxyTousseGoodsInvoiceManager.java	(.../TestPDAForeignProxyTousseGoodsInvoiceManager.java)	(revision 26651)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignProxyTousseGoodsInvoiceManager.java	(.../TestPDAForeignProxyTousseGoodsInvoiceManager.java)	(revision 33360)
@@ -88,6 +88,7 @@
 		// 设置为已灭菌状态
 		for (TousseInstance tousseInstance : tousseList) {
 			tousseInstance.setStatus(TousseInstance.STATUS_STERILED);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 		}
 		//运行前对全局变量清空,以防止影响下一个用例的运行结果
 		WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD);
@@ -148,6 +149,7 @@
 		// 设置为已灭菌状态
 		for (TousseInstance tousseInstance : tousseList) {
 			tousseInstance.setStatus(TousseInstance.STATUS_STERILED);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 		}
 		//运行前对全局变量清空,以防止影响下一个用例的运行结果
 		WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java
===================================================================
diff -u -r30571 -r33360
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java	(.../TestPDAProxyTousseGoodsInvoiceManager.java)	(revision 30571)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java	(.../TestPDAProxyTousseGoodsInvoiceManager.java)	(revision 33360)
@@ -168,6 +168,7 @@
 			tousseInstance.setFluctuationPrice(6.50);
 			tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
 			tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_OR);
+			tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 			tousseInstance.setStatisticsAmount(1);
 			tousseInstance.setPackageType("纸塑");
 			tousseInstance.setForeignTousseApp_id(foreignTousseApplications.get(0).getId());
@@ -191,6 +192,7 @@
 				tousseInstance.setFluctuationPrice(6.50);
 				tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
 				tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_OR);
+				tousseInstance.setWareHouseId(wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD).getId());
 				tousseInstance.setStatisticsAmount(1);
 				tousseInstance.setPackageType("纸塑");
 				tousseInstance.setForeignTousseApp_id(foreignTousseApplications.get(0).getId());