Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r15299 -r15347 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 15299) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 15347) @@ -3596,6 +3596,12 @@ materialInstance.setTousse(newTousseDefinition); + JSONObject obj = CssdUtils.getGoodsNameAndSp(materialName); + MaterialDefinition md = materialDefinitionManager.getForeignTousseMaterialDefinition(obj.optString("materialName"), obj.optString("specification")); + if(md == null){ + throw new RuntimeException(materialName+",材料定义已不存在!"); + } + materialInstance.setMaterialDefinition(md); materialInstanceList.add(materialInstance); tousseAmount += amount;