Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r13689 -r13770 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 13689) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 13770) @@ -37,6 +37,7 @@ import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; +import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseDefinitionUtils; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryManager; @@ -1341,6 +1342,8 @@ tousseDefinition.setMaterialInstances(materialInstanceList); tousseDefinition .setDiposableGoodsItems(diposableGoodsInstanceList); + // 设置材料的顺序 + TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinition); totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition); successCount++; @@ -1759,6 +1762,8 @@ bindTousseDefinition(materialInstanceList, tousseDefinition); tousseDefinition.setMaterialInstances(materialInstanceList); tousseDefinition.setDiposableGoodsItems(diposableGoodsInstanceList); + // 设置材料的顺序 + TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinition); totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition); tousseDefinition.setAncestorID(tousseDefinition.getId()); successCount++;