Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r20115 -r20116 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20115) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20116) @@ -4337,7 +4337,6 @@ tousseDefinition.setMaterialInstances(materialInstanceList); tousseDefinition .setDiposableGoodsItems(diposableGoodsInstanceList); - // 设置材料的顺序 TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinitionMaterials); totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition); @@ -4465,6 +4464,7 @@ tousseDefinition = null; continue; } + String tousseType = "聚合包"; Double price = 0.0; Double borrowPrice = 0.0; @@ -4481,8 +4481,6 @@ isReview = TousseDefinition.STR_YES; } tousseDefinition.setIsReview(isReview); - - String tousseName = ParerUtils.getCellFormatValue(row, tousseNameIndex); boolean isNewTousse = false; TousseDefinition persistenceTousseDefinition = tousseDefinitionManager @@ -4703,13 +4701,9 @@ } } - - // 如果是最后一个 if (tousseDefinition != null) { - successCount++; } - // 格式:成功插入数量#插入失败数量#失败行1,失败行2... msg.put("聚合包管理", successCount + "#" + failureCount + "#" + sb.toString());