Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r35518 -r35530 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 35518) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 35530) @@ -3520,7 +3520,7 @@ return; } //同一个条码,已经进行了预回收操作后,不允许再被其他的预回收单扫码进行预回收;QYSRMYY-54 - String countSql = String.format("select cout(*) from %s prs " + String countSql = String.format("select count(0) from %s prs " + "join %s ti on ti.id = prs.tousseItemId " + "where prs.tousseInstanceBarcode = '%s' and ti.recyclingApplication_ID <> %s", PrepareRecyleScanBarcode.class.getSimpleName(), @@ -3565,7 +3565,9 @@ && !scanBarcodeList.contains(tousseInstanceBarcode)){ scanBarcodeList.add(tousseInstanceBarcode); } - tousseDefinitionIDScanBarcodeMap.put(tousseDefinitionId, scanBarcodeList); + if(CollectionUtils.isNotEmpty(scanBarcodeList)){ + tousseDefinitionIDScanBarcodeMap.put(tousseDefinitionId, scanBarcodeList); + } } } } catch (Exception e) {