Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r32274 -r32279 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 32274) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 32279) @@ -566,19 +566,16 @@ } } } - List materialInstances = new ArrayList(); //3.设置包定义的新的材料明细及统计其材料量、md5 if(CollectionUtils.isNotEmpty(needAddMiList)){ for(MaterialInstance mi : needAddMiList){ materialInstanceManager.save(mi); miList.add(mi); - materialInstances.add(mi); } } if(CollectionUtils.isNotEmpty(needUpdateMiList)){ for(MaterialInstance mi : needUpdateMiList){ materialInstanceManager.save(mi); - materialInstances.add(mi); } } if(CollectionUtils.isNotEmpty(needDeleteMiList)){ @@ -588,9 +585,8 @@ } } //处理这种没有编辑过材料明细信息(既没有新增材料、也没有修改材料数量及删除材料的情况)情况出现的问题(FSSZYY-31 消毒物品发货材料数量与对应申请单里的材料数量不一致) - if(CollectionUtils.isEmpty(materialInstances)){ - materialInstances.addAll(miList); - } + List materialInstances = new ArrayList(); + materialInstances.addAll(miList); td.setMaterialInstances(materialInstances); td.calculateMaterialAmount(); td.generateMaterialsMD5();