Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r19595 -r19596 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 19595) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 19596) @@ -3878,10 +3878,11 @@ //如果已扫描的条码不为空的话,需要排除 if(StringUtils.isNotBlank(scanedBarcodes)){ List scanedBarcodeList = Arrays.asList(scanedBarcodes.split(",")); + List barcodeList = new ArrayList(); for(String scanedBarcode : scanedBarcodeList){ - scanedBarcode = "'" + scanedBarcode + "'"; + barcodeList.add("'" + scanedBarcode + "'"); } - sql += " and barcode not in ("+ StringUtils.join(scanedBarcodeList, ",") +") "; + sql += " and barcode not in ("+ StringUtils.join(barcodeList, ",") +") "; } if(td.isDisinfection() || td.isForeignProxyTousse()){ sql += " and tousseDefinition.ancestorID = " + td.getId(); @@ -3890,9 +3891,9 @@ } String statusCondition = "'"+ TousseInstance.STATUS_SIGNED +"'"; //已发货未签收的包是否可以录使用记录 - boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord"); + boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord" , true); if(notSignedItemsCanRegistUseRecord){ - statusCondition = ",'"+ TousseInstance.STATUS_SHIPPED +"'"; + statusCondition += ",'"+ TousseInstance.STATUS_SHIPPED +"'"; } sql += " and status in ("+ statusCondition +")"; sql += " order by validUntil ";