Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java
===================================================================
diff -u -r25372 -r30068
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java	(.../ReturnMaterialRecordManagerImpl.java)	(revision 25372)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java	(.../ReturnMaterialRecordManagerImpl.java)	(revision 30068)
@@ -315,7 +315,7 @@
 	}
 
 	public List<ReturnGoodsItemVO.PriceAmount> loadMaterialPriceAmountInfoCanReturned(
-			String departCoding,String materialDefId,String sourceWareHouseId){
+			String departCoding, String settleAccountsDepartCoding, String materialDefId,String sourceWareHouseId){
 		StringBuilder sql = new StringBuilder();
 		List<ReturnGoodsItemVO.PriceAmount> priceAmountList = new LinkedList<ReturnGoodsItemVO.PriceAmount>();
 		
@@ -330,6 +330,7 @@
 						isNullFunction,materialDefId,isNullFunction,isNullFunction));
 		sql.append(" and i.departCoding = '" + departCoding + "'");// 限定部门
 //		sql.append(" and i.orgUnitCoding='" + AcegiHelper.getCurrentOrgUnitCode() + "'");
+		sql.append(" and i.settleAccountsDepartCoding = '" + settleAccountsDepartCoding + "'");// 限定结算科室
 		sql.append(" and i.sourceWarehouseId=" + sourceWareHouseId );
 		sql.append(" group by m.price");
 		System.out.println(sql);
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManager.java
===================================================================
diff -u -r14590 -r30068
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManager.java	(.../ReturnMaterialRecordManager.java)	(revision 14590)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManager.java	(.../ReturnMaterialRecordManager.java)	(revision 30068)
@@ -33,5 +33,5 @@
 	 * @return
 	 */
 	public List<ReturnGoodsItemVO.PriceAmount> loadMaterialPriceAmountInfoCanReturned(
-			String departCoding,String materialDefId,String sourceWareHouseId);
+			String departCoding, String settleAccountsDepartCoding, String materialDefId,String sourceWareHouseId);
 }
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java
===================================================================
diff -u -r30035 -r30068
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java	(.../ReturnMaterialRecordTableManager.java)	(revision 30035)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/dwr/table/ReturnMaterialRecordTableManager.java	(.../ReturnMaterialRecordTableManager.java)	(revision 30068)
@@ -120,8 +120,8 @@
 		}		
 		return json.toString();
 	}
-	public List<ReturnGoodsItemVO.PriceAmount> loadMaterialPriceAmountInfoCanReturned(String departCoding,String materialDefId,String sourceWareHouseId){
-		return returnMaterialRecordManager.loadMaterialPriceAmountInfoCanReturned(departCoding, materialDefId,sourceWareHouseId);
+	public List<ReturnGoodsItemVO.PriceAmount> loadMaterialPriceAmountInfoCanReturned(String departCoding, String settleAccountsDepartCoding, String materialDefId,String sourceWareHouseId){
+		return returnMaterialRecordManager.loadMaterialPriceAmountInfoCanReturned(departCoding, settleAccountsDepartCoding, materialDefId,sourceWareHouseId);
 	}
 	/**
 	 * 获取退货材料详情