Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java =================================================================== diff -u -r34690 -r34700 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34690) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34700) @@ -239,14 +239,16 @@ idCardInstanceList.stream().forEach(instance -> { Long instanceId = instance.getId(); List instrumentInstanceList = idCardInstanceIdToInstrumentInstanceListMap.get(instanceId); - //标识牌对应的包定义是否回收,如果为是,则从回收环节创建器械循环实例、如果为否则从装配环节开始创建循环实例 - Boolean isRecycling = idCardInstanceIdToIsRecyclingMap.get(instanceId); - boolean isFirstSectionForCrateCycleInstace = isFirstSectionForCrateCycleInstace(cls,isRecycling); - if(isFirstSectionForCrateCycleInstace){ - //3.对于需要创建器械循环实例的器械实例,则创建器械循环实例,并将器械循环实例的当前环节的id修改为当前环节的recordId - batchInsertInstrumentCycleInstance(instance,instrumentInstanceList,idCardInstanceIdTousseInstanceMap,cls,recordId); - }else{ - batchUpdateInstrumentCycleInstance(instance,instrumentInstanceList,idCardInstanceIdTousseInstanceMap,cls, recordId, idCardInstanceIdToMaterialDefinitionIdToAmountMapMap); + if(CollectionUtils.isNotEmpty(instrumentInstanceList)){ + //标识牌对应的包定义是否回收,如果为是,则从回收环节创建器械循环实例、如果为否则从装配环节开始创建循环实例 + Boolean isRecycling = idCardInstanceIdToIsRecyclingMap.get(instanceId); + boolean isFirstSectionForCrateCycleInstace = isFirstSectionForCrateCycleInstace(cls,isRecycling); + if(isFirstSectionForCrateCycleInstace){ + //3.对于需要创建器械循环实例的器械实例,则创建器械循环实例,并将器械循环实例的当前环节的id修改为当前环节的recordId + batchInsertInstrumentCycleInstance(instance,instrumentInstanceList,idCardInstanceIdTousseInstanceMap,cls,recordId); + }else{ + batchUpdateInstrumentCycleInstance(instance,instrumentInstanceList,idCardInstanceIdTousseInstanceMap,cls, recordId, idCardInstanceIdToMaterialDefinitionIdToAmountMapMap); + } } }); }