Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r34953 -r34954 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34953) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 34954) @@ -8771,14 +8771,9 @@ if (materialAmount == 0) { throw new RuntimeException("数据异常,请联系管理员!"); } - String mdKey = "_" + md.getName() + "_"; - if(StringUtils.isNotBlank(md.getUnit())){ - mdKey += md.getUnit(); - } - mdKey += "_"; - if(StringUtils.isNotBlank(md.getSpecification())){ - mdKey += md.getSpecification(); - } + String mdKey = "_" + md.getName() + "_" + + (StringUtils.isBlank(md.getUnit())?null:md.getUnit()) + "_" + + (StringUtils.isBlank(md.getSpecification())?null:md.getSpecification()); for (MaterialErrorDamageDetail detail : result) { if(materialAmount <= 0){ break; @@ -8834,11 +8829,11 @@ String type = keyArr[0]; String materialName = keyArr[1]; String unit = keyArr[2]; - if(unit == null){ + if("null".equals(unit)){ unit = ""; } String specification = keyArr[3]; - if(StringUtils.isNotBlank(specification)){ + if(!"null".equals(specification)){ materialName += "[" + specification + "]";; } if(MaterialErrorDamageDetail.TYPE_ERROR.equals(type)){