Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java =================================================================== diff -u -r27461 -r27462 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java (.../TousseIntoBasketService.java) (revision 27461) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java (.../TousseIntoBasketService.java) (revision 27462) @@ -307,8 +307,8 @@ for (ClassifyBasket needQueryBasket : needQueryBaskets) { classifyBasketMap.put(needQueryBasket.getContainerBarcode(), needQueryBasket); } + baskets.addAll(needQueryBaskets); } - baskets.addAll(needQueryBaskets); } List tds = new ArrayList(); if(CollectionUtils.isNotEmpty(baskets)){ @@ -331,8 +331,8 @@ for (TousseDefinition needQueryTd : needQueryTds) { tdMap.put(needQueryTd.getId(), needQueryTd); } + tds.addAll(needQueryTds); } - tds.addAll(needQueryTds); } baskets.forEach(p->{ if(CollectionUtils.isNotEmpty(p.getClassfiedItems())){