Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r39821 -r39874 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 39821) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 39874) @@ -12477,7 +12477,8 @@ } } //如果启用允许外来器械拆分小包部分发货,判断其它拆分小包是否也已经发货,如果其它外来器械拆分小包未发货则不允许录使用记录 - else if(ti.getTousseDefinition().isSplit() && CssdUtils.getSystemSetConfigByNameBool("allowPartlyInvoiceForeignTousse")){ + else if(ti.getTousseDefinition().isSplit() && CssdUtils.getSystemSetConfigByNameBool("allowPartlyInvoiceForeignTousse") + && !StringUtils.equals(ti.getTousseDefinition().getDataSource(), TousseDefinition.DATASOURCE_JLK)){ int count = objectDao.countBySql("select count(0) from " + TousseInstance.class.getSimpleName() + " where tousseDefinition_id in (select id from "+ TousseDefinition.class.getSimpleName() +" where parentId=" + ti.getTousseDefinition().getParentID() + ") and status <> '"+ TousseInstance.STATUS_DISCARD +"' and invoice_id is null"); @@ -12488,7 +12489,8 @@ //如果启用外来器械申请单是否允许申请多套外来器械包,判断该申请单的其它外来器械包是否也已经发货,如果其它外来器械包未发货则不允许录使用记录 if(ti.getTousseDefinition().isForeignOrSplitTousse()){ - if(CssdUtils.getSystemSetConfigByNameBool("allowApplyMultipleForeignTousse") == true){ + if(CssdUtils.getSystemSetConfigByNameBool("allowApplyMultipleForeignTousse") == true + && !StringUtils.equals(ti.getTousseDefinition().getDataSource(), TousseDefinition.DATASOURCE_JLK)){ int count = objectDao.countBySql("select count(0) from " + TousseInstance.class.getSimpleName() + " where foreignTousseApp_id=" + ti.getForeignTousseApp_id() + " and status <> '" + TousseInstance.STATUS_DISCARD + "' and invoice_id is null"); if(count > 0){