Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r36327 -r36582
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 36327)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 36582)
@@ -2633,6 +2633,12 @@
 		String useOldInvoiceVersionParam = StrutsParamUtils.getPraramValue("useOldInvoice", String.valueOf(useOldInvoiceVersion));
 		//是否辅助发货,如果从辅助发货页面发货成功后,则该参数为true.其它页面不传递此参数
 		boolean auxiliaryInvoice = StrutsParamUtils.getBoolPraramValue("auxiliaryInvoice", false);
+		//卡迪斯货柜的ip地址、端口、托盘(库位)id、开口号(手术预约发货功能增加发货到卡迪斯货柜BJDXZLYY-35)
+		String kardexContainerHost = StrutsParamUtils.getPraramValue("kardexContainerHost", "");
+		Integer KardexContainerPort = StrutsParamUtils.getPraramValue("KardexContainerPort", 15008);
+		Long storageLocationId = StrutsParamUtils.getPraramLongValue("storageLocationId", null);
+		String storageLocationAddr = StrutsParamUtils.getPraramValue("storageLocationAddr", "");
+		
 		params.put("tousseGroupIds", tousseGroupIds);
 		params.put("invoiceType", invoiceType);
 		params.put("mode", mode);
@@ -2652,6 +2658,11 @@
 //		List<ScanGoodsVo> voList = getInvoiceGoodsVo(sendOutGoodsStoreData);
 		params.put("invoiceItems", sendOutGoodsItems);
 		
+		params.put("storageLocationId", storageLocationId);
+		params.put("storageLocationAddr", storageLocationAddr);
+		params.put("kardexContainerHost", kardexContainerHost);
+		params.put("KardexContainerPort", KardexContainerPort);
+		
 		//申请日期
 		String applyDate = StrutsParamUtils.getPraramValue("applyDate", "");
 		if(StringUtils.isNotBlank(applyDate)){