Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r37861 -r37862 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 37861) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 37862) @@ -3963,8 +3963,6 @@ // 非敷料包的,回收都会产生装配任务(消毒物品不追溯时,也不生产装配任务) if (!tousseDefinition.isDressing()&& !tousseDefinition.isHomeMadeTousse() &&tousseDefinition.needPacking()) { - PackingTask task = findPackingTask(packingTasks, basketBarcode, tousseDefinitionID, idCardBarcode); - IDCardInstance idCardInstance = null; TousseInstance idCardTousseInstance = null; if(StringUtils.isNotBlank(idCardBarcode)){ @@ -3984,6 +3982,7 @@ if(noPassIDCardInstances.size() > 0){//有不符合条件的标识牌 没有必要再走下去 但需要继续循环找出其它不符合条件的标识牌 continue; } + PackingTask task = findPackingTask(packingTasks, basketBarcode, tousseDefinitionID, idCardBarcode); //已装配 if (task == null && amount < 0) { JSONObject description = new JSONObject();