Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r15447 -r15452 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15447) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15452) @@ -4242,6 +4242,12 @@ data); return result; }else if (barcodeDevice instanceof Container) { + if(Invoice.TYPE_OPERATION_RESERVATION.equals(invoiceType)){ + return buildErrorMsgJsonResult(String.format("手术预约发货暂时不支持扫篮筐发货!")); + } + if(Invoice.TYPE_CUSTOM.equals(invoiceType)){ + return buildErrorMsgJsonResult(String.format("自定义发货暂时不支持扫篮筐发货!")); + } if(Container.CONTAINER_PURPOSE_DISINFECTION.equals(((Container) barcodeDevice).getPurpose())){ // 容器(整筐发货),针对灭菌篮筐(单个)的处理 Map multiResult = loadSterilizeBasketInsideTousseInstance(