Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r16804 -r16908 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 16804) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 16908) @@ -872,12 +872,16 @@ if(td == null){ errorMessage = tousseInstance.getTousseName()+",包定义已不存在!"; }else{ - try { - tousseDefinitionManager.validateCssdHandleTousses( - cssdOrgUnitCode, cssdOrgUnitName, - td.getTousseType(), td.getName()); - } catch (Exception e) { - errorMessage = e.getMessage(); + if(TousseDefinition.PACKAGE_TYPE_COMBO.equals(td.getTousseType())){ + errorMessage = "不能回收聚合包!"; + }else{ + try { + tousseDefinitionManager.validateCssdHandleTousses( + cssdOrgUnitCode, cssdOrgUnitName, + td.getTousseType(), td.getName()); + } catch (Exception e) { + errorMessage = e.getMessage(); + } } } } else if (barcodeDevice instanceof User) {