Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r38858 -r38860 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 38858) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 38860) @@ -4830,7 +4830,10 @@ || lastOperatedTousseInstance.isUsed() || lastOperatedTousseInstance.isSigned() || lastOperatedTousseInstance.isPreRecycled()){ - lastOperatedTousseInstance.setStatus(TousseInstance.STATUS_RECYCLED); + boolean enableAnInstanceIsGeneratedAfterRecycled = CssdUtils.getSystemSetConfigByNameBool("enableAnInstanceIsGeneratedAfterRecycled", false); + if(!enableAnInstanceIsGeneratedAfterRecycled){ + lastOperatedTousseInstance.setStatus(TousseInstance.STATUS_RECYCLED); + } //如果包实例的器械包定义id与该回收记录的某条回收项的包定义id相同时,设置该包实例的回收项id为该回收项的id if(CollectionUtils.isNotEmpty(recyclingRecord.getItems())){ for (RecyclingItem recyclingItem : recyclingRecord.getItems()) { @@ -4922,11 +4925,14 @@ } //丢失报损关联的器械包实例改为已回收 - TousseInstance ti = tousseInstanceManager.getTousseInstanceByBarcode(detail.getTousseBarcode()); - if(ti != null && !TousseInstance.STATUS_RECYCLED.equals(ti.getStatus())){ - if(thisTimeTds.contains(ti.getTousseDefinition().getId())){//只修改本次入筐的包实例 - ti.setStatus(TousseInstance.STATUS_RECYCLED); - tousseInstanceManager.save(ti); + boolean enableAnInstanceIsGeneratedAfterRecycled = CssdUtils.getSystemSetConfigByNameBool("enableAnInstanceIsGeneratedAfterRecycled", false); + if(!enableAnInstanceIsGeneratedAfterRecycled){ + TousseInstance ti = tousseInstanceManager.getTousseInstanceByBarcode(detail.getTousseBarcode()); + if(ti != null && !TousseInstance.STATUS_RECYCLED.equals(ti.getStatus())){ + if(thisTimeTds.contains(ti.getTousseDefinition().getId())){//只修改本次入筐的包实例 + ti.setStatus(TousseInstance.STATUS_RECYCLED); + tousseInstanceManager.save(ti); + } } } }