Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r17330 -r17331 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 17330) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 17331) @@ -230,8 +230,10 @@ if (CollectionUtils.isNotEmpty(tousseItemList)) { return false; } else if (CollectionUtils.isNotEmpty(tousseInstanceList)) { - if ((tousseInstanceList.size() == 1 && !tousseInstanceList.get(0).getTousseFixedBarcode()) - || tousseInstanceList.size() > 1) { //1、只产生了一条包实例说明是固定条码(为了保险,还是加一个判断确认他是固定条码才可以删除) 2、产生的包实例数量大于1 + if (tousseInstanceList.size() == 1 && tousseInstanceList.get(0).getTousseFixedBarcode()) { //1、只产生了一条包实例说明是固定条码(为了保险,还是加一个判断确认他是固定条码才可以删除) + tousseInstanceManager.delete(tousseInstanceList.get(0)); //一定要先删除固定条码,在删除包定义(他们有主外键关系) + return doDelete(tousseDefinition); + } else { return false; } }