Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r20116 -r20117 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20116) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20117) @@ -4315,9 +4315,9 @@ if (row == null || ParerUtils.isBlankRow(row)) { continue; } - checkName.clear(); String name = ParerUtils.getCellFormatValue(row, ComboTousseNameIndex); if (StringUtils.isNotBlank(name)) { + checkName.clear(); @SuppressWarnings("unchecked") TousseDefinition tousseDefinitions = (TousseDefinition) objectDao .getBySql(TousseDefinition.class.getSimpleName(),"where po.name = '"+ name +"' and po.tousseType = '"+"聚合包"+"'"); @@ -4495,7 +4495,6 @@ bindTousseDefinition(tousseDefinition , materialInstanceList,diposableGoodsInstanceList); tousseDefinition.setMaterialInstances(materialInstanceList); tousseDefinition.setDiposableGoodsItems(diposableGoodsInstanceList); - // 设置材料的顺序 TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinitionMaterials); totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition); tousseDefinition.setAncestorID(tousseDefinition.getId());