Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r29898 -r29904
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 29898)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 29904)
@@ -263,7 +263,7 @@
 		
 		String sql = String
 //				.format(" select d from %s i,%s d where i.id = d.invoice.id and i.depart = '%s' and d.name = '%s' and d.batch = '%s' and (ABS(d.price-%s)<%s) and (d.amount > %s(d.returnedAmount,0)) and d.identificationID is not null and d.invoiceItemID is not null order by i.applicationTime desc",
-				.format(" select d from %s i,%s d where i.id = d.invoice.id and i.sourceWarehouseId=%s and i.settleAccountsDepart = '%s' and d.disposableGoodsBatchStockID=%s and (ABS(d.price-%s)<%s) and (d.amount > (%s(d.returnedAmount,0)+%s(d.useAmount,0))) and d.identificationID is not null and d.invoiceItemID is not null order by i.applicationTime desc",
+				.format(" select d from %s i,%s d where i.id = d.invoice.id and i.sourceWarehouseId=%s and i.depart = '%s' and d.disposableGoodsBatchStockID=%s and (ABS(d.price-%s)<%s) and (d.amount > (%s(d.returnedAmount,0)+%s(d.useAmount,0))) and d.identificationID is not null and d.invoiceItemID is not null order by i.applicationTime desc",
 						Invoice.class.getSimpleName(),
 						DiposableGoodsItem.class.getSimpleName(), warehouseID,depart,
 						disposableGoodsBatchStockID, price.toString(),