Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r33662 -r33664 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 33662) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 33664) @@ -4784,7 +4784,7 @@ + "and (tdancestor.id = ti.tousseDefinitionId or td.id = ti.tousseDefinitionId )" + "and tis.tousseFixedBarcode = 0 " + invoicePlanCommonCondition - + " group by ti.tousseName,tis.status, tdancestor.id, ip.id, ip.recyclingStatus)) r"; + + " group by ti.tousseName,tis.status, tdancestor.id, ip.id, ip.recyclingStatus)) r order by tousseBarcode "; ResultSet rs = null; try { rs = objectDao.executeSql(sql); @@ -4814,7 +4814,6 @@ Map> result = new HashMap>(); if(CollectionUtils.isNotEmpty(tousseInstanceVoList)){ - tousseInstanceVoList.sort((t1, t2) -> StringUtils.compare(t1.getBarcode(), t2.getBarcode())); for (ApplicationGoodsVo applicationGoodsVo : tousseInstanceVoList) { Long key = applicationGoodsVo.getInvoicePlanIDList().get(0); List tempList = result.get(key);