Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r33817 -r33831 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33817) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33831) @@ -8388,6 +8388,10 @@ }else if(!isFixedBarcode && Constants.STR_YES.equals(td.getIsDisable())){ errorMessage = td.getName() + "已经停用,不能进行回收,请用新的包名称进行回收!"; }else{ + if(TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType())){ + errorMessage = "条码"+ barcode +"对应的物品【"+ td.getName() +"】的类型为敷料包,不允许进行回收!"; + break out; + } TousseDefinition ancestorTd = null; if(!isFixedBarcode && td.getAncestorID() != null && td.getId().longValue() != td.getAncestorID().longValue()){ ancestorTd = tousseDefinitionManager.get(td.getAncestorID()); @@ -8497,6 +8501,9 @@ //判断该包定义是否已禁用标识牌 errorMessage = "器械包"+ tousseDefinition.getName() +"已禁用标识牌"; break out; + }else if(TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseDefinition.getTousseType())){ + errorMessage = "条码"+ barcode +"对应的物品【"+ tousseDefinition.getName() +"】的类型为敷料包,不允许进行回收!"; + break out; } //祖先包定义也要判断 TousseDefinition ancestorTd = tousseDefinitionManager.get(tousseDefinition.getAncestorID());