Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r35632 -r35649
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 35632)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 35649)
@@ -3672,7 +3672,7 @@
         }
         String rootPath = Path.getWebAppRoot();
         String project = CssdUtils.getProjectName();
-        String jsonPath = rootPath + "/WEB-INF/classes/config/"+project+"/orInvoiceDeptConfig.json";
+        String jsonPath = rootPath + "/disinfectsystem/config/"+project+"/interfaces/orInvoiceDeptConfig.json";
         String jsonStr = CssdUtils.readFile(jsonPath);
         
         LoginUserData loginUser = AcegiHelper.getLoginUser();
@@ -3780,6 +3780,8 @@
 		
 		//通过调用发货action的调用方式(因为灭菌完成事务未结束时包实例的状态没有持久化更新为已灭菌导致发货不能成功的不一致性问题,所以此处不能用这种方式)
 		params.put("sendOutGoodsStoreData", invoiceItemArray.toString());
+		//二级供应室自动发货使用新版发货
+		params.put("useOldInvoice", "false");
 		String result = CssdUtils.postRequest(url, params,request.getSession().getId(), com.forgon.tools.Constants.CHARSET_UTF8);
 		return JSONObject.fromObject(result);
     }
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r35499 -r35649
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 35499)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 35649)
@@ -2621,6 +2621,10 @@
 		String sourceWarehouseId = StrutsParamUtils.getPraramValue("sourceWarehouseId", "");
 		String sourceWarehouseName = StrutsParamUtils.getPraramValue("sourceWarehouseName", "");
 		String appFormType = StrutsParamUtils.getPraramValue("appFormType", "");
+		//是否使用旧版发货,默认不使用旧版,而是使用新版
+		boolean useOldInvoiceVersion = CssdUtils.getSystemSetConfigByNameBool("useOldInvoiceVersion");
+		//是否使用旧版发货(如果参数没有传参,则用默认值(即配置项),否则用传的参数)
+		String useOldInvoiceVersionParam = StrutsParamUtils.getPraramValue("useOldInvoice", String.valueOf(useOldInvoiceVersion));
 		//是否辅助发货,如果从辅助发货页面发货成功后,则该参数为true.其它页面不传递此参数
 		boolean auxiliaryInvoice = StrutsParamUtils.getBoolPraramValue("auxiliaryInvoice", false);
 		params.put("tousseGroupIds", tousseGroupIds);
@@ -2673,7 +2677,7 @@
 			 * 先优化申领发货,后续再优化自定义发货、辅助发货、手术预约发货、手术预约合并发货、高值耗材发货
 			 */
 			if(StringUtils.equals(invoiceType, Invoice.TYPE_APPLICATION)){
-				if(CssdUtils.getSystemSetConfigByNameBool("useOldInvoiceVersion")){
+				if(Boolean.parseBoolean(useOldInvoiceVersionParam)){
 					invoiceContext = invoiceManager.submitInvoice(params);
 				}else{
 					invoiceContext = invoiceOptimizeManager.submitInvoice(params);