Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r28347 -r28350
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28347)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28350)
@@ -102,6 +102,7 @@
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
 import com.forgon.disinfectsystem.entity.borrowrecord.BorrowRecord;
 import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
+import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceDepartment;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation;
@@ -1386,12 +1387,14 @@
 		try{
 			//解决广医二院2019-11-29一次性物品固定条码pda发货报json格式的问题
 			params = JSONObject.fromObject(params.toString().replace("\\\\\\", "\\"));
-			if(CssdUtils.getSystemSetConfigByNameBool("useOldInvoiceVersion")){
+			String invoiceType = JSONUtil.optString(params, "invoiceType", Invoice.TYPE_APPLICATION);
+			//如果开启旧版本发货或不为申领发货时,调用原发货方法.否则调用新发货方法
+			if(CssdUtils.getSystemSetConfigByNameBool("useOldInvoiceVersion") || !StringUtils.equals(invoiceType, Invoice.TYPE_APPLICATION)){
 				//优化前的方法
 				invoiceManager.submitInvoice(params);
 			}else{
 				//优化后的方法
-				invoiceOptimizeManager.submitInvoiceForInvoicePlanModule(params);
+				invoiceOptimizeManager.submitInvoice(params);
 			}
 			return JSONUtil.buildJsonObject(true).toString();
 		} catch (Exception ex){
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
===================================================================
diff -u -r28292 -r28350
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 28292)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 28350)
@@ -110,6 +110,12 @@
 			"order by invoicePlan.applicationTime";
 
 	@Override
+	public SubmitInvoiceContext submitInvoice(JSONObject params) {
+		// TODO Auto-generated method stub
+		return submitInvoiceForInvoicePlanModule(params);
+	}
+
+	@Override
 	public SubmitInvoiceContext submitInvoiceForInvoicePlanModule(
 			JSONObject params) {
 		SubmitInvoiceContext context = new SubmitInvoiceContext();