Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
===================================================================
diff -u -r28796 -r37401
--- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 28796)
+++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 37401)
@@ -39,6 +39,18 @@
     	        showResult("单号为" + records[i].data['serialNumber'] + "的申请单已终止!");
     	        return false;
             }
+            if(sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer && formType == 'operationReservation'){
+                var endStatus = records[i].data['deliverStatus'];
+                var committedStatus = records[i].data['committedStatus'];
+                if(endStatus == "已终止"){
+                    showResult("单号为" + records[i].data['serialNumber'] + "的手术预约单已终止!");
+                    return false;
+                }
+                if(!committedStatus){
+                    showResult("单号为" + records[i].data['serialNumber'] + "的手术预约单未提交，不需要终止!");
+                    return false;
+                }
+            }
             if(formType == 'invoicePlanGridId'){
                 if(ids.indexOf(records[i].data['invoicePlanId']) == -1){
                     ids[k] = records[i].data['invoicePlanId'];
@@ -56,6 +68,18 @@
 	        showResult("该申请单已终止!");
 	        return false;
         }
+        if(sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer && formType == 'operationReservation'){
+            var endStatus = records[0].data['deliverStatus'];
+            var committedStatus = records[0].data['committedStatus'];
+            if(endStatus == "已终止"){
+                showResult("该手术预约单已终止!");
+                return false;
+            }
+            if(!committedStatus){
+                showResult("该手术预约单未提交，不需要终止!");
+                return false;
+            }
+        }
     }
     
     var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp", '','请选择终止原因', "760", "400");
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r37392 -r37401
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 37392)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 37401)
@@ -1746,7 +1746,7 @@
 		iconCls: 'btn_ext_pause',
 		hidden: !sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer,
 		handler: function () {
-			terminateInvoicePlan(grid);
+			terminateInvoicePlan(grid,'operationReservation');
 		}
 	}, '-', {
 		text: '库存查看',