Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r14085 -r14119 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14085) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14119) @@ -590,6 +590,9 @@ MaterialDefinition md = materialDefinitionManager .getMaterialDefinitionByName(name, specification); + if(md == null){ + throw new RuntimeException(name+",材料定义已不存在,保存失败!"); + } item.setMaterialDefinition(md); item.setIsRestrictAmountGoods(md.isRestrictAmountGoods()); item.setItemType(ClassifiedItem.TYPE_MATERIAL); @@ -799,7 +802,7 @@ tousseDefinitionMap.put(id, tousseDefinition); } if(tousseDefinition == null){ - throw new RuntimeException("ID="+id+"的器械包已不存在"); + throw new RuntimeException("ID="+id+"的器械包定义已不存在,保存失败!"); } return tousseDefinition; }