Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r26872 -r26877 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 26872) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 26877) @@ -4730,12 +4730,12 @@ sqlStatus+=" or status = '"+TousseInstance.STATUS_REVIEWED+"'"; //此固定条码下所有的包实例条码 - List barcodeList =getTousseInsDataByFixedBarcode(fixedBarcode,"",sqlStatus,"barcode",0,oldBarcodesList.size()); + List barcodeList =getTousseInsDataByFixedBarcode(fixedBarcode,"",sqlStatus,"barcode",0,null); //筛选符合删除条件的条码 - oldBarcodesList.retainAll(barcodeList); + oldBarcodesList.retainAll(barcodeList); //页面上已扫描的条码转成List ArrayList arrayList = new ArrayList(Arrays.asList(oldBarcodes));