Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r37411 -r37428 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 37411) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 37428) @@ -15234,6 +15234,18 @@ if(StringUtils.equals(orgUnitCoding, currentOrgUnitCode)){ continue; } + + //不支持自定义发货的物品 + TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition(); + if(!tousseDefinition.isInsideTousse() && !tousseDefinition.isDressing() && !tousseDefinition.isForeignTousse() && !tousseDefinition.isSplit()){ + continue; + } + if(DatabaseUtil.isPoIdValid(tousseInstance.getProxyDisinfection_id())){ + continue; + } + if(tousseInstance.isBelongsToComboTousse()){ + continue; + } //当前登录科室把已灭菌、已消毒的器械包从当前登录科室的库位中取出 if(StringUtils.equals(storageLocation.getOrgUnitCode(), currentOrgUnitCode)){