Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java =================================================================== diff -u -r41258 -r41259 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java (.../LaoKenThirdPartyTousseReceiveRecordManagerImpl.java) (revision 41258) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java (.../LaoKenThirdPartyTousseReceiveRecordManagerImpl.java) (revision 41259) @@ -1343,7 +1343,7 @@ for (MaterialInstanceVo materialInstanceVo : materialInstanceVos) { MaterialDefinition materialDefinition = getDBMaterialDefinition(thirdPartyTousseInstanceVo, materialInstanceVo, thirdPartyIdMaterialDefinitionMap, nameMaterialDefinitionMap); String goodsName = materialInstanceVo.getMaterialName(); - //前端页面由=有加限制,后端代码也保持一致 + //前端页面有加限制,后端代码也保持一致 if(StringUtils.contains(goodsName, "[") || StringUtils.contains(goodsName, "'")){ throw new RuntimeException("物品名称不能包含特殊字符!"); } @@ -1452,7 +1452,6 @@ if(CollectionUtils.isEmpty(thirdPartyTousseInstances)){ return nameMaterialDefinitionMap; } - List materialDefinitionList = new ArrayList(); for (ThirdPartyTousseInstanceVo thirdPartyTousseInstanceVo : thirdPartyTousseInstances) { List materialInstanceVos = thirdPartyTousseInstanceVo.getMaterialInstanceVos(); if(CollectionUtils.isEmpty(materialInstanceVos)){ @@ -1469,16 +1468,11 @@ } voMaterialNameList.add(materialInstanceVo.getShowName()); + if(nameMaterialDefinitionMap.containsKey(materialInstanceVo.getShowName())){ + continue; + } MaterialDefinition materialDefinition = materialDefinitionManager.getMaterialDefinitionByName(materialInstanceVo.getMaterialName(), materialInstanceVo.getSpecification()); if(materialDefinition != null){ - materialDefinitionList.add(materialDefinition); - } - } - } - - if(CollectionUtils.isNotEmpty(materialDefinitionList)){ - for (MaterialDefinition materialDefinition : materialDefinitionList) { - if(StringUtils.isBlank(materialDefinition.getSpecification())){ nameMaterialDefinitionMap.put(materialDefinition.getShowName(), materialDefinition); } }