Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java
===================================================================
diff -u -r13055 -r16761
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java	(.../TestPDAForeignTousseGoodsInvoiceManager.java)	(revision 13055)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java	(.../TestPDAForeignTousseGoodsInvoiceManager.java)	(revision 16761)
@@ -6,6 +6,9 @@
 import java.util.Date;
 import java.util.List;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.test.annotation.Rollback;
 import org.testng.annotations.Test;
@@ -15,6 +18,7 @@
 
 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.departmentstock.DepartmentStock;
 import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
@@ -33,13 +37,17 @@
 	 * 外来器械申请单申请单其tousseItem及tousseInstance的tousseName都带下划线
 	 */
 	private void createForeignTousseGoodsApplication(){
+		
+		TousseDefinition foreignTousseTousseDefinition = tousseDefinitionManager.getTousseDefinitionByName("test骨科外来器械包");
 		foreignTousseApplication = new ForeignTousseApplication();
 		foreignTousseApplication.setApplicant("林倩");
 		foreignTousseApplication.setApplicationTime(new Date());
 		foreignTousseApplication.setCommittedStatus(true);
 		foreignTousseApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
 		foreignTousseApplication.setDepart(Constants.ORG_UNIT_NAME_OR);
 		foreignTousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR);
+		foreignTousseApplication.setHandleDepart(Constants.ORG_UNIT_NAME_OR);
+		foreignTousseApplication.setHandleDepartCoding(Constants.ORG_UNIT_CODE_OR);
 		foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
 		foreignTousseApplication.setType(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION);
 		foreignTousseApplication.setSerialNumber("2014101700001");
@@ -50,6 +58,7 @@
 		
 		TousseItem item = new TousseItem();
 		item.setTousseName("test骨科外来器械包");
+		item.setTousseDefinitionId(foreignTousseTousseDefinition.getId());
 		item.setInvoicePlanID(foreignTousseApplication.getId());
 		item.setAmount(1);
 		item.setDiposable("否");
@@ -58,6 +67,26 @@
 		list.add(item);
 		foreignTousseApplication.setApplicationItems(list);
 		tousseItemManager.saveOrUpdate(item);
+		
+		//
+		
+		TousseInstance tousseInstance = new TousseInstance();
+		tousseInstance.setTousseDefinition(foreignTousseTousseDefinition);
+		tousseInstance.setTousseName("test骨科外来器械包");
+		tousseInstance.setForeignTousseApp_id(foreignTousseApplication.getId());
+		tousseInstance.setInvoicePlanID(foreignTousseApplication.getId());
+		tousseInstance.setBarcode(barcodeArray1[0]);
+		tousseInstance.setType(TousseDefinition.PACKAGE_TYPE_FOREIGN);
+		tousseInstance.setStatus(TousseInstance.STATUS_STERILED);
+		tousseInstance.setPrice(356.00);
+		tousseInstance.setFluctuationPrice(356.00);
+		tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR);
+		tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_OR);
+		tousseInstance.setStatisticsAmount(10);
+		tousseInstance.setPackageType("纸塑");
+		tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_OR);
+		tousseInstanceManager.saveOrUpdate(tousseInstance);
+		//
 		foreignTousseApplicationManager.saveOrUpdate(foreignTousseApplication);
 	}
 	
@@ -128,16 +157,33 @@
 	 */
 	@Test
 	public void testSendAllForeignTousseGoods(){
-		//运行前对全局变量清空,以防止影响下一个用例的运行结果
-		map.clear();
-		map.put("201410160001", 1);
-		map.put("departCode", Constants.ORG_UNIT_CODE_OR);
-		String jsonStr = createSendOutParam(map);
-		SendForeignTousseGoods(jsonStr, testAll);
+		prepareData();
+		WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD);
+		assertNotNull(wareHouse_CSSD);
+		
+		JSONObject params = new JSONObject();
+		JSONArray invoiceItems1 = new JSONArray();
+		String barcode = "201410160001";
+		//发普通器械包
+		JSONObject invoiceItems1_1 = new JSONObject();
+		invoiceItems1_1.put("barcode", barcode);
+		invoiceItems1_1.put("sendAmount", 1);
+		invoiceItems1_1.put("isRoutine", TousseInstance.ROUTINE_YES);
+		invoiceItems1.add(invoiceItems1_1);
+		
+		params.put("mode", "depart");
+		params.put("departCode", Constants.ORG_UNIT_CODE_OR);
+		params.put("assistantSender", "朱广兴");
+		params.put("sender", "朱广兴");
+		params.put("invoiceItems", invoiceItems1);
+		params.put("sourceWarehouseId", wareHouse_CSSD.getId());
+		params.put("sourceWarehouseName", wareHouse_CSSD.getName());
+		
+		SendForeignTousseGoods(params.toString(), testAll);
 	}
 	
 	public void SendForeignTousseGoods(String jsonStr, String type){
-		prepareData();
+		
 		//只发一个条码的器械包,只会对申请单2014101700001的申请对进行对应发货,2014101700002的不会发货
 		webServiceManager.submitInvoicePlans(jsonStr);
 		//外来器械申请单的发货单
@@ -193,9 +239,9 @@
 		//创建器械包定义
 		initBasicData();
 		createForeignTousseGoodsApplication();
-		createForeignTousseGoodsInstance();
+//		createForeignTousseGoodsInstance();
 		//创建代理灭菌申请单
-		createProxyDisifectionApplication();
+//		createProxyDisifectionApplication();
 	}
 	
 }