Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r16797 -r16812
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 16797)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 16812)
@@ -3150,10 +3150,18 @@
 		return exist;
 	}
 
-	// 创建还物单
-	// applyReturnTousses参数为申请归还的物品
-	// 传入actualReturnTousses作为输出参数，此方法会把实际归还的物品放入map中
-	// 返回值为剩余归还物品，即 [ 申请归还物品 - 实际归还物品 = 剩余归还物品]
+	/**
+	 * 创建“申请还物单”<br/>
+	 * applyReturnTousses参数为申请归还的物品<br/>
+	 * 传入actualReturnTousses作为输出参数，此方法会把实际归还的物品放入map中<br/>
+	 * 返回值为剩余归还物品，即 [ 申请归还物品 - 实际归还物品 = 剩余归还物品]
+	 * 
+	 * @param applicant	
+	 * @param borrowApplicationId
+	 * @param applyReturnTousses
+	 * @param OUT_actualReturnTousses
+	 * @return
+	 */
 	@Override
 	public Map<String, Integer> createReturnApplication(String applicant,
 			Long borrowApplicationId, Map<String, Integer> applyReturnTousses,
@@ -3291,7 +3299,7 @@
 		CollectionUtils.forAllDo(borrowApplication.getApplicationItems(), new Closure<TousseItem>(){
 			@Override
 			public void execute(TousseItem borrowTousseItem) {
-				if(BooleanUtils.isTrue(borrowTousseItem.getIsTerminated()))
+				if(BooleanUtils.isTrue(borrowTousseItem.getIsTerminated()))  //已终止
 					return;
 				String tousseName = borrowTousseItem.getTousseName();
 				int sendOutAmount = MapUtils.getInteger(unreturnTousseMap, tousseName, 0);
@@ -3307,7 +3315,7 @@
 				CollectionUtils.forAllDo(returnApplication.getApplicationItems(), new Closure<TousseItem>(){
 					@Override
 					public void execute(TousseItem returnedTousseItem) {
-						if(BooleanUtils.isTrue(returnedTousseItem.getIsTerminated()))
+						if(BooleanUtils.isTrue(returnedTousseItem.getIsTerminated()))  //已终止
 							return;
 						String tousseName = returnedTousseItem.getTousseName();
 						Integer unreturnAmount = unreturnTousseMap.get(tousseName);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
===================================================================
diff -u -r16622 -r16812
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 16622)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 16812)
@@ -106,7 +106,7 @@
 
 	public OrgUnit getOrgUnitByOrgName(String depart);
 	/**
-	 * 科室是否是一级供应室
+	 * 判断此科室编码是否是一级供应室
 	 * @param orgUnitCoding
 	 * @return
 	 */
@@ -119,7 +119,8 @@
 	 */
 	public boolean isSupplyRoomUser(LoginUserData user);
 	/**
-	 * 判断登录用户是否是供应室用户,包括一级供应室和二级供应室，优化速度，一条查询sql判断，不用查询几次
+	 * 判断登录用户是否是供应室用户,包括一级供应室和二级供应室，优化速度，一条查询sql判断，不用查询几次<br/>
+	 * 此方法是isSupplyRoomUser方法的升级版本
 	 * @param user 登录用户信息
 	 * @return
 	 */
Index: forgon-core/src/main/java/com/forgon/component/grid/GridManager.java
===================================================================
diff -u -r13181 -r16812
--- forgon-core/src/main/java/com/forgon/component/grid/GridManager.java	(.../GridManager.java)	(revision 13181)
+++ forgon-core/src/main/java/com/forgon/component/grid/GridManager.java	(.../GridManager.java)	(revision 16812)
@@ -62,6 +62,11 @@
 	public String converJsonString(Integer totalResults, List rows, String sql,
 			String[] filterProperties);
 
+	/**
+	 * 解析前台传过来的参数
+	 * @param parameterMap
+	 * @return
+	 */
 	public Map<String, String> getParamFromView(
 			Map<String, List<String>> parameterMap);
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r16622 -r16812
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 16622)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 16812)
@@ -470,7 +470,11 @@
 		}
 		return null;
 	}
-	// 科室是否是一级供应室
+	/**
+	 * 判断此科室编码是否是一级供应室
+	 * @param orgUnitCoding
+	 * @return
+	 */
 	public boolean isFirstSupplyRoomOrgUnit(String orgUnitCoding){
 		boolean isFirstSupplyRoomOrgUnit = false;
 		SupplyRoomConfig firstSupplyRoom = getFirstSupplyRoomConfig();
@@ -526,7 +530,12 @@
 		}
 		return false;
 	}
-	// 一条sql判断是否为供应室
+	/**
+	 * 判断登录用户是否是供应室用户,包括一级供应室和二级供应室，优化速度，一条查询sql判断，不用查询几次<br/>
+	 * 此方法是isSupplyRoomUser方法的升级版本
+	 * @param user 登录用户信息
+	 * @return
+	 */
 	public boolean isSupplyRoomUser2(LoginUserData user) {
 		if(user == null){
 			return false;
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
===================================================================
diff -u -r16717 -r16812
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 16717)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 16812)
@@ -143,6 +143,18 @@
 	
 	public Map<String, Integer> getUnreturnTousse(Long borrowApplicationId);
 	
+	/**
+	 * 创建“申请还物单”<br/>
+	 * applyReturnTousses参数为申请归还的物品<br/>
+	 * 传入actualReturnTousses作为输出参数，此方法会把实际归还的物品放入map中<br/>
+	 * 返回值为剩余归还物品，即 [ 申请归还物品 - 实际归还物品 = 剩余归还物品]
+	 * 
+	 * @param applicant	
+	 * @param borrowApplicationId
+	 * @param applyReturnTousses
+	 * @param OUT_actualReturnTousses
+	 * @return
+	 */
 	public Map<String, Integer> createReturnApplication(String applicant,
 			Long borrowApplicationId, Map<String, Integer> applyReturnTousses,
 			Map<String, Integer> OUT_actualReturnTousses);
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
===================================================================
diff -u -r16102 -r16812
--- ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 16102)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 16812)
@@ -714,6 +714,11 @@
 		return JSONUtil.toJSONStringEx(map, true, filterProperties);
 	}
 
+	/**
+	 * 解析前台传过来的参数
+	 * @param parameterMap
+	 * @return
+	 */
 	public Map<String, String> getParamFromView(
 			Map<String, List<String>> parameterMap) {
 		Map<String, String> paramMap = new HashMap<String, String>();