Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java
===================================================================
diff -u -r13052 -r16683
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java	(.../PDADuplicateInvoice.java)	(revision 13052)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java	(.../PDADuplicateInvoice.java)	(revision 16683)
@@ -6,12 +6,19 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.testng.annotations.Test;
 
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.directory.model.BarcodeDevice;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -27,16 +34,31 @@
 	public void testDuplicateInvoice() {
 
 		prepareData();
-
-		map.clear();
-		for (String barcode : barcodeArrayOfTousseA) {
-			map.put(barcode, 1);
+		WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD);
+		assertNotNull(wareHouse_CSSD);
+		
+		JSONObject params = new JSONObject();
+		JSONArray invoiceItems1 = new JSONArray();
+		
+		//发普通器械包
+		for(String barcode : barcodeArrayOfTousseA){
+			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);
 		}
-		map.put("departCode", "3266");
-		String jsonStr = createSendOutParam(map);
+		
+		params.put("mode", "depart");
+		params.put("departCode", "3266");
+		params.put("assistantSender", "朱广兴");
+		params.put("sender", "朱广兴");
+		params.put("invoiceItems", invoiceItems1);
+		params.put("sourceWarehouseId", wareHouse_CSSD.getId());
+		params.put("sourceWarehouseName", wareHouse_CSSD.getName());
 
-		String resultStr1 = webServiceManager.submitInvoicePlans(jsonStr);
-		String resultStr2 = webServiceManager.submitInvoicePlans(jsonStr);
+		String resultStr1 = webServiceManager.submitInvoicePlans(params.toString());
+		String resultStr2 = webServiceManager.submitInvoicePlans(params.toString());
 
 		JsonParser jsonParser = new JsonParser();
 		JsonObject result1 = jsonParser.parse(resultStr1).getAsJsonObject();