Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
===================================================================
diff -u -r14732 -r14827
--- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 14732)
+++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 14827)
@@ -5,7 +5,7 @@
         return false;
     }
 	for(var i = 0;i < records.length;i++){
-		if ("已发货" == records[i].get('deliverStatus')){
+		if ("已发货" == records[i].get('deliverStatus') && "借物单" != records[i].get('type')){
 			showResult("该单已发货或已终止的，不能被终止!");
 			return false;
 		}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
===================================================================
diff -u -r14423 -r14827
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 14423)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 14827)
@@ -412,6 +412,10 @@
 			if (invoicePlan == null){
 				throw new RuntimeException("终止失败，找不到相关记录！");
 			}
+			//除了发货单其他申请单发货状态如果是已发货则不能终止
+			if (Invoice.STATUS_DELIVERED.equals(invoicePlan.getDeliverStatus()) && !InvoicePlan.TYPE_BORROWINGSINGLE.equals(invoicePlan.getType())){
+				throw new RuntimeException("该单已发货或已终止的，不能被终止!");
+			}
 			String userName = AcegiHelper.getLoginUser().getUserFullName();
 			if (StringUtils.isBlank(endCause)) {
 				endCause = "不明";