Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/model/InvoiceInfo.java
===================================================================
diff -u
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/model/InvoiceInfo.java	(revision 0)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/model/InvoiceInfo.java	(revision 16753)
@@ -0,0 +1,89 @@
+package test.forgon.disinfectsystem.invoicemanager.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InvoiceInfo {
+	/**
+	 * 发货模式
+	 */
+	private String mode = "depart";
+	/**
+	 * 发往和科室
+	 */
+	private String departCode;
+	/**
+	 * 核对人
+	 */
+	private String assistantSender;
+	/**
+	 * 发货人
+	 */
+	private String sender;
+	/**
+	 * 源仓库id
+	 */
+	private Long sourceWarehouseId;
+	/**
+	 * 发货项信息
+	 */
+	private List<InvoiceItemInfo> invoiceItems = new ArrayList<>();
+	
+	public String getMode() {
+		return mode;
+	}
+	public void setMode(String mode) {
+		this.mode = mode;
+	}
+	public String getDepartCode() {
+		return departCode;
+	}
+	public void setDepartCode(String departCode) {
+		this.departCode = departCode;
+	}
+	public String getAssistantSender() {
+		return assistantSender;
+	}
+	public void setAssistantSender(String assistantSender) {
+		this.assistantSender = assistantSender;
+	}
+	public String getSender() {
+		return sender;
+	}
+	public void setSender(String sender) {
+		this.sender = sender;
+	}
+	public Long getSourceWarehouseId() {
+		return sourceWarehouseId;
+	}
+	public void setSourceWarehouseId(Long sourceWarehouseId) {
+		this.sourceWarehouseId = sourceWarehouseId;
+	}
+	public List<InvoiceItemInfo> getInvoiceItems() {
+		return invoiceItems;
+	}
+	public void setInvoiceItems(List<InvoiceItemInfo> invoiceItems) {
+		this.invoiceItems = invoiceItems;
+	}
+	/**
+	 * 创建发货单参数。发货模式为科室。所有物品为常规发货
+	 * @param departCode 发往的科室
+	 * @param assistantSender 核对人名称
+	 * @param sender 发货人名称
+	 * @param sourceWarehouseId 源仓库id
+	 * @param tousseBarcodes 器械包的条码数组
+	 * @return
+	 */
+	public static InvoiceInfo getDepartInvoiceParam(String departCode,String assistantSender,
+			String sender,Long sourceWarehouseId,String[] tousseBarcodes){
+		InvoiceInfo ii = new InvoiceInfo();
+		ii.setAssistantSender(assistantSender);
+		ii.setDepartCode(departCode);
+		ii.setSender(sender);
+		ii.setSourceWarehouseId(sourceWarehouseId);
+		for(String barcode : tousseBarcodes){
+			ii.getInvoiceItems().add(new InvoiceItemInfo(barcode));
+		}
+		return ii;
+	}
+}
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/model/InvoiceItemInfo.java
===================================================================
diff -u
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/model/InvoiceItemInfo.java	(revision 0)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/model/InvoiceItemInfo.java	(revision 16753)
@@ -0,0 +1,53 @@
+package test.forgon.disinfectsystem.invoicemanager.model;
+
+import com.forgon.Constants;
+
+/**
+ * 发货项信息，用于产生发货参数
+ * @author kzh
+ *
+ */
+public class InvoiceItemInfo {
+	private String barcode;
+	private Integer sendAmount;
+	private String isRoutine = Constants.STR_YES;
+	
+	/**
+	 * 使用条码生成对象。器械包可以用这样构造,数量就为1,是属于常规发货
+	 * @param barcode
+	 */
+	public InvoiceItemInfo(String barcode){
+		this.barcode = barcode;
+		this.sendAmount = 1;
+	}
+	/**
+	 * 使用条码和数量构造对象。一次性物品可以这样构造
+	 * @param barcode
+	 * @param amount
+	 */
+	public InvoiceItemInfo(String barcode,int amount){
+		this.barcode = barcode;
+		this.sendAmount = amount;
+	}
+	
+	public String getBarcode() {
+		return barcode;
+	}
+	public void setBarcode(String barcode) {
+		this.barcode = barcode;
+	}
+	public Integer getSendAmount() {
+		return sendAmount;
+	}
+	public void setSendAmount(Integer sendAmount) {
+		this.sendAmount = sendAmount;
+	}
+	public String getIsRoutine() {
+		return isRoutine;
+	}
+	public void setIsRoutine(String isRoutine) {
+		this.isRoutine = isRoutine;
+	}
+	
+	
+}
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java
===================================================================
diff -u -r16752 -r16753
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java	(.../TestPDATousseInvoiceManager.java)	(revision 16752)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java	(.../TestPDATousseInvoiceManager.java)	(revision 16753)
@@ -13,6 +13,7 @@
 import net.sf.json.JSONObject;
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
+import test.forgon.disinfectsystem.invoicemanager.model.InvoiceInfo;
 
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
@@ -217,35 +218,13 @@
 	}
 
 	private JSONObject createInvoiceParam(WareHouse wareHouse_CSSD,boolean isAll) {
-		JSONObject params = new JSONObject();
-		JSONArray invoiceItems1 = new JSONArray();
-		
-		JSONObject invoiceItems1_1 = new JSONObject();
-		invoiceItems1_1.put("barcode", "201410260001");
-		invoiceItems1_1.put("sendAmount", 1);
-		invoiceItems1_1.put("isRoutine", TousseInstance.ROUTINE_YES);
-		invoiceItems1.add(invoiceItems1_1);
-		
-		JSONObject invoiceItems1_2 = new JSONObject();
-		invoiceItems1_2.put("barcode", "201410260002");
-		invoiceItems1_2.put("sendAmount", 1);
-		invoiceItems1_2.put("isRoutine", TousseInstance.ROUTINE_YES);
-		invoiceItems1.add(invoiceItems1_2);
-		
-		if(isAll){
-			JSONObject invoiceItems1_3 = new JSONObject();
-			invoiceItems1_3.put("barcode", "201410260003");
-			invoiceItems1_3.put("sendAmount", 1);
-			invoiceItems1_3.put("isRoutine", TousseInstance.ROUTINE_YES);
-			invoiceItems1.add(invoiceItems1_3);
+		String[] barcodes = barcodeArray1;
+		if(!isAll){
+			barcodes = new String[]{"201410260001","201410260002"};
 		}
-		params.put("mode", "depart");
-		params.put("departCode", clinicOrgUnitCode);
-		params.put("assistantSender", "朱广兴");
-		params.put("sender", "朱广兴");
-		params.put("invoiceItems", invoiceItems1);
-		params.put("sourceWarehouseId", wareHouse_CSSD.getId());
-		params.put("sourceWarehouseName", wareHouse_CSSD.getName());
-		return params;
+		InvoiceInfo ii = InvoiceInfo.getDepartInvoiceParam(clinicOrgUnitCode, "朱广兴", "朱广兴", 
+				wareHouse_CSSD.getId(), barcodes);
+		return JSONObject.fromObject(ii);
+
 	}
 }