Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java
===================================================================
diff -u -r12532 -r13049
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java	(.../TestInvoiceManagerForTousse.java)	(revision 12532)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java	(.../TestInvoiceManagerForTousse.java)	(revision 13049)
@@ -449,91 +449,34 @@
 		supplyRoomConfigManager.getSystemParamsObj().setDptCodeOfForeignTousse(
 				AcegiHelper.getLoginUser()
 						.getOrgUnitCodingFromSupplyRoomConfig());
-		String sendOutGoodsStoreData = "";
 
-		for (String barcode : barcodeArray1) {
-			if (sendOutGoodsStoreData.equals(""))
-				sendOutGoodsStoreData = barcode
-						+ "#&1#&否#&Test开胸包#&3.14#&2018-02-12#&3.14";
-			else
-				sendOutGoodsStoreData += ("#@" + barcode + "#&1#&否#&Test开胸包#&3.14#&2018-02-12#&3.14");
-		}
-
-		for (String barcode : foreignBarcodeArray) {
-			if (sendOutGoodsStoreData.equals(""))
-				sendOutGoodsStoreData = barcode
-						+ "#&1#&否#&骨科外来器械包_20141017000101#&5.9#&2018-02-12#&5.9";
-			else
-				sendOutGoodsStoreData += ("#@" + barcode + "#&1#&否#&骨科外来器械包_20141017000101#&5.9#&2018-02-12#&5.9");
-		}
-
-		for (String barcode : disinfectionBarcodeArray) {
-			if (sendOutGoodsStoreData.equals(""))
-				sendOutGoodsStoreData = barcode
-						+ "#&1#&否#&（妇产科护士）止血带_2014001#&2.5#&2018-02-12#&2.5";
-			else
-				sendOutGoodsStoreData += ("#@" + barcode + "#&1#&否#&（妇产科护士）止血带_2014001#&2.5#&2018-02-12#&2.5");
-		}
-		for (String barcode : customBarcodeArray) {
-			if (sendOutGoodsStoreData.equals(""))
-				sendOutGoodsStoreData = barcode
-						+ "#&1#&否#&内三科自定义包_2014002#&9.2#&2018-02-12#&9.2";
-			else
-				sendOutGoodsStoreData += ("#@" + barcode + "#&1#&否#&内三科自定义包_2014002#&9.2#&2018-02-12#&9.2");
-		}
-		for (String barcode : foreignproxyBarcodeArray) {
-			if (sendOutGoodsStoreData.equals(""))
-				sendOutGoodsStoreData = barcode
-						+ "#&1#&否#&外部代理灭菌包#&12.3#&2018-02-12#&12.3";
-			else
-				sendOutGoodsStoreData += ("#@" + barcode + "#&1#&否#&外部代理灭菌包#&12.3#&2018-02-12#&12.3");
-		}
-		for (String barcode : sterilizationBarcodeArray) {
-			if (sendOutGoodsStoreData.equals(""))
-				sendOutGoodsStoreData = barcode
-						+ "#&1#&否#&代理灭菌包#&7.8#&2018-02-12#&7.8";
-			else
-				sendOutGoodsStoreData += ("#@" + barcode + "#&1#&否#&代理灭菌包#&7.8#&2018-02-12#&7.8");
-		}
-
-		try {
-			/*String recyclingappStoreData = "Test开胸包#&3#&否 #&3"
-					+ "#@骨科外来器械包_20141017000101#&1#&否#&1"
-					+ "#@（妇产科护士）止血带_2014001#&1#&否#&1"
-					+ "#@内三科自定义包_2014002#&1#&否#&1" + "#@外部代理灭菌包#&3#&否 #&4"
-					+ "#@代理灭菌包#&2#&否 #&2";
-			InvoicePlanManager.sendOutGoods("3266", sendOutGoodsStoreData,
-					recyclingappStoreData, "张晓丽", "李小明");*/
-			JSONObject params = new JSONObject();
-			params.put("mode", "depart");
-			params.put("departCode", "3266");
-			params.put("assistantSender", "admin");
-			params.put("sender", "admin");
-			
-			List<ScanGoodsVo> voList = new ArrayList<ScanGoodsVo>();
-			
-			ScanGoodsVo vo = new ScanGoodsVo();
-			vo.setBarcode("20140211001");
-			vo.setSendAmount(1);
-			voList.add(vo);
-			
-			vo = new ScanGoodsVo();
-			vo.setBarcode("20140211002");
-			vo.setSendAmount(1);
-			voList.add(vo);
-			
-			vo = new ScanGoodsVo();
-			vo.setBarcode("20140211003");
-			vo.setSendAmount(1);
-			voList.add(vo);
-			
-			params.put("invoiceItems", voList);
-			
-			invoiceManager.submitInvoice(params);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		JSONObject params = new JSONObject();
+		params.put("mode", "depart");
+		params.put("departCode", "3266");
+		params.put("assistantSender", "admin");
+		params.put("sender", "admin");
 		
+		List<ScanGoodsVo> voList = new ArrayList<ScanGoodsVo>();
+		
+		ScanGoodsVo vo = new ScanGoodsVo();
+		vo.setBarcode("20140211001");
+		vo.setSendAmount(1);
+		voList.add(vo);
+		
+		vo = new ScanGoodsVo();
+		vo.setBarcode("20140211002");
+		vo.setSendAmount(1);
+		voList.add(vo);
+		
+		vo = new ScanGoodsVo();
+		vo.setBarcode("20140211003");
+		vo.setSendAmount(1);
+		voList.add(vo);
+		
+		params.put("invoiceItems", voList);
+		
+		invoiceManager.submitInvoice(params);
+		
 		//普通器械包
 		InvoicePlan invoicePlan = (InvoicePlan) objectDao.getByProperty(
 				InvoicePlan.class.getSimpleName(), "serialNumber",
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java
===================================================================
diff -u -r13045 -r13049
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java	(.../InvoiceManagerForComboFormTests.java)	(revision 13045)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java	(.../InvoiceManagerForComboFormTests.java)	(revision 13049)
@@ -1,5 +1,7 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -13,17 +15,20 @@
 import java.util.Map;
 import java.util.Set;
 
+import net.sf.json.JSONObject;
+
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
-import net.sf.json.JSONObject;
+import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.IdentificationOfDisposableGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
@@ -35,8 +40,6 @@
 import com.forgon.tools.MathTools;
 
 import test.forgon.constant.Constants;
-import test.forgon.disinfectsystem.AbstractCSSDTest;
-
 /**
  * 通用申请单发货
  * @author WangYi
@@ -362,7 +365,10 @@
 	@Test
 	public void testSubmitInvoicePlans() throws Exception{
 		initData();
-		
+		WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD");
+		assertNotNull(wareHouse1);
+		Long warehouseID = wareHouse1.getId();
+		String warehouseName = wareHouse1.getName();
 		JSONObject params = new JSONObject();
 		params.put("mode", "depart");
 		params.put("departCode", "3266");