Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r15497 -r15550 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15497) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15550) @@ -96,7 +96,7 @@ var ids = null; for ( var i = 0, len = records.length; i < len; i++) { var status = records[i].data['deliverStatus']; - if(status=='已发货'|| status=='已终止'){ + if(status=='已终止'){ showResult("流水号为【"+records[i].data['serialNumber']+"】的单已发货或已终止,不能被终止!"); return; }else{ Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js =================================================================== diff -u -r14827 -r15550 --- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js (.../terminateInvoicePlan.js) (revision 14827) +++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js (.../terminateInvoicePlan.js) (revision 15550) @@ -5,7 +5,11 @@ return false; } for(var i = 0;i < records.length;i++){ - if ("已发货" == records[i].get('deliverStatus') && "借物单" != records[i].get('type')){ + var type = records[i].get('type'); + if(type == '外部器械包代理灭菌申请单'){ + continue; + } + if ("已发货" == records[i].get('deliverStatus') && "借物单" != type){ showResult("该单已发货或已终止的,不能被终止!"); return false; }