Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r34839 -r34840 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34839) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34840) @@ -411,10 +411,7 @@ //根据使用记录的外来器械包实例的找到原单 Set foreignTousseApplicationSet = null; - //外器器械包定义ID - List foreignTousseDefinitionIdList = new ArrayList(); - //1.该使用记录所有的包实例 List tousseInstances = tousseInstanceManager .findTousseInstanceListByUseRecordId(useRecordId); @@ -526,17 +523,10 @@ if(foreignTousseApplication != null){ foreignTousseApplicationSet.add(foreignTousseApplication); } - if(tousseInstance.getTousseDefinition().isForeignTousse()){ - foreignTousseDefinitionIdList.add(tousseInstance.getTousseDefinition().getId()); - }else if(tousseInstance.getTousseDefinition().isSplit()){ - foreignTousseDefinitionIdList.add(tousseInstance.getTousseDefinition().getParentID()); - } - } } if(CollectionUtils.isNotEmpty(foreignTousseApplicationSet)){ - List foreignTousseApplicationIdList = new ArrayList(); for (ForeignTousseApplication tempForeignTousseApplication : foreignTousseApplicationSet) { String orginalRemark = tempForeignTousseApplication.getRemark(); String newRemark = (orginalRemark == null ? "" : orginalRemark + ";") + @@ -551,18 +541,7 @@ tempForeignTousseApplication.setRecyclingStatus(ForeignTousseApplication.APPLICATION_STATUS_SIGNED); } objectDao.saveOrUpdate(tempForeignTousseApplication); - foreignTousseApplicationIdList.add(tempForeignTousseApplication.getId()); } - if(CollectionUtils.isNotEmpty(foreignTousseDefinitionIdList)){ - String updateSql = String.format("update %s set packageStatus = '%s' where packageStatus = '%s' and %s and %s ", - TousseItem.class.getSimpleName(), - InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED, - TousseInstance.STATUS_USED, - SqlUtils.getNonStringFieldInLargeCollectionsPredicate("recyclingApplication_ID", foreignTousseApplicationIdList), - SqlUtils.getNonStringFieldInLargeCollectionsPredicate("tousseDefinitionId", foreignTousseDefinitionIdList)); - objectDao.excuteSQL(updateSql); - } - } }