Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r15466 -r15471 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15466) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15471) @@ -4091,6 +4091,14 @@ return buildErrorMsgJsonResult(String.format("自定义发货暂时不支持类型为%s的器械包!", tousseDefinition.getTousseType())); } } + if(DatabaseUtil.isPoIdValid(tousseInstance.getProxyDisinfection_id())){ + if(Invoice.TYPE_OPERATION_RESERVATION.equals(invoiceType)){ + return buildErrorMsgJsonResult(String.format("手术预约发货暂时不支持代理灭菌包!", tousseDefinition.getTousseType())); + } + if(Invoice.TYPE_CUSTOM.equals(invoiceType)){ + return buildErrorMsgJsonResult(String.format("自定义发货暂时不支持代理灭菌包!", tousseDefinition.getTousseType())); + } + } //如果器械包实例条件(尾)不为空 if(StringUtils.isNotBlank(barcodeEnd)){