Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r32889 -r32920 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 32889) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 32920) @@ -657,6 +657,16 @@ } } + //查出该使用记录对应关联的外来器械包申请单,并将其使用记录的外键置空SSTS-483 + List foreignTousseApplicationList = + objectDao.findBySql_ForUpdate(ForeignTousseApplication.class.getSimpleName(), " where useRecord.id=" + useRecordId); + if(CollectionUtils.isNotEmpty(foreignTousseApplicationList)){ + for (ForeignTousseApplication foreignTousseApplication : foreignTousseApplicationList) { + foreignTousseApplication.setUseRecord(null); + objectDao.saveOrUpdate(foreignTousseApplication); + } + } + //查出该使用记录转换后的对应申请单,加上对应的备注(如果申请单的状态还是待回收则还需要对应减去相应物品的申请数量) List allRecyclingApplicationListList = objectDao.findBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), " where id in (select invoicePlanId from "+ UseRecordToRecycleApplication.class.getSimpleName() +" where useRecordId="+ useRecordId +")");