Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r36838 -r37168 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 36838) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 37168) @@ -545,7 +545,6 @@ } jdbcTemplate.execute(sbf.toString()); sbf.setLength(0); - String totalBarcodeSql = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("bd.barcode", totalBarcodes); /*sbf.append("select ti.useRecord_id from "); sbf.append(TousseInstance.class.getSimpleName()); sbf.append(" ti join "); @@ -563,8 +562,8 @@ sbf.append(IDCardInstance.class.getSimpleName()); sbf.append(" ii on ii.lastTousseInstanceId=ti.id join "); sbf.append(BarcodeDevice.class.getSimpleName()); - sbf.append(" bd on bd.id=ii.id where td.isRecycling='是' and ti.useRecord_id is not null and "); - sbf.append(totalBarcodeSql); + sbf.append(" bd on bd.id=ii.id where td.isRecycling='是' and ti.useRecord_id is not null "); + sbf.append(SqlUtils.getInStringListSql("bd.barcode", totalBarcodes)); useRecordIds.addAll(objectDao.getLongSet(sbf.toString())); } } @@ -1406,7 +1405,6 @@ item.setMaterialAmount(newAmount); item.setMaterialSplitAmount(newAmount * (md.getSplitAmount() == null?1:md.getSplitAmount())); }else{ - item.setTousseDefinition(tousseDefinition); item.setMaterialAmount(tousseDefinition.getMaterialAmount()); item.setMaterialSplitAmount(tousseDefinition.getMaterialSplitAmount()); item.setIsRestrictAmountGoods(tousseDefinition.isRestrictAmountGoods());