Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r40645 -r40656 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40645) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40656) @@ -11390,18 +11390,20 @@ errorMessage = ancestorTd.getName() + "为不需要回收物品,无需回收。"; break out; } + String checkResult = checkTousseStatusForIdCardInstance(idCardInstance.getId(),recyclingRecordId); + if(StringUtils.isNotBlank(checkResult)){ + errorType = "idCard_statusIllegal"; + errorMessage = checkResult; + break out; + } if(tousseInstance == null){ tousseInstance = IDCardInstanceUtils .getLastOperatedTousseInstance(objectDao, idCardInstance); } if (tousseInstance == null) { // errorMessage = "没有找到和标识牌绑定的器械包!"; - errorMessage = checkTousseStatusForIdCardInstance(idCardInstance.getId(),recyclingRecordId); - if(errorMessage != null){ - errorType = "idCard_statusIllegal"; - break out; - } + tousseInstance = new TousseInstance(); TousseDefinition td = tousseDefinitionManager.get(idCardDefinition.getTousseDefinitionID()); tousseInstance.setTousseDefinition(td);