Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r12843 -r12844
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 12843)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 12844)
@@ -1426,8 +1426,9 @@
 					sender, barcodeObjMap,barcodeToDisposableGoodsBatchStockMap, assistantSender,tousseInstancesToUpdate,params);
 			if (invoice != null) {
 				// 设置仓库信息
-				invoice.setWarehouseID(Long.valueOf(warehouseID));
-				invoice.setWarehouseName(warehouseName);
+				invoice.setSourceWarehouseId(Long.valueOf(warehouseID));
+				invoice.setSourceWarehouseName(warehouseName);
+				setDefaultWarehouse(invoice,invoice.getInvoicePlan().getSettleAccountsDepartCoding());
 				invoiceList.add(invoice);
 				// 修改库存数量
 //				updateGoodsStock(invoice,tousseInstancesToUpdate);
@@ -1464,6 +1465,22 @@
 			}
 		}
 	}
+	/**
+	 * 设置发货单所属的仓库
+	 * @param tousseInstance
+	 * @param orgUnitCoding
+	 */
+	private void setDefaultWarehouse(Invoice invoice,String orgUnitCoding){
+		WareHouse warehouse = wareHouseManager.getDefaultWareHouseByUnitCode(orgUnitCoding);
+		Long id = null;
+		String name = "";
+		if(warehouse != null){
+			id = warehouse.getId();
+			name = warehouse.getName();
+		}
+		invoice.setWarehouseID(id);
+		invoice.setWarehouseName(name);
+	}
 	private boolean isSendOutCompletely (Map<String, Integer> sendOutAmountMap,
 			Map<String, Integer> sendOutBarcodeAmountMap){
 		for (Integer amount : sendOutAmountMap.values()) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
===================================================================
diff -u -r12754 -r12844
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java	(.../Invoice.java)	(revision 12754)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java	(.../Invoice.java)	(revision 12844)
@@ -107,6 +107,14 @@
 	 * 仓库名称
 	 */
 	private String warehouseName;
+	/**
+	 * 发货的仓库Id
+	 */
+	private Long sourceWarehouseId;
+	/**
+	 * 发货的仓库名称
+	 */
+	private String sourceWarehouseName;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -379,5 +387,21 @@
 	public void setWarehouseName(String warehouseName) {
 		this.warehouseName = warehouseName;
 	}
+
+	public Long getSourceWarehouseId() {
+		return sourceWarehouseId;
+	}
+
+	public void setSourceWarehouseId(Long sourceWarehouseId) {
+		this.sourceWarehouseId = sourceWarehouseId;
+	}
+
+	public String getSourceWarehouseName() {
+		return sourceWarehouseName;
+	}
+
+	public void setSourceWarehouseName(String sourceWarehouseName) {
+		this.sourceWarehouseName = sourceWarehouseName;
+	}
 	
 }