Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r14177 -r14327
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14177)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14327)
@@ -2259,4 +2259,41 @@
 		}
 		return null;
 	}
+
+	@Override
+	public JSONObject handleUrgentAmountAndAmount(TousseItemVo tousseItemVo) {
+		Integer amount = tousseItemVo.getAmount();
+		Integer urgentAmount = tousseItemVo.getUrgentAmount();
+		//如果是消毒物品且拆包的情况下
+		if ("消毒物品".equals(tousseItemVo.getTousseType()) && "否".equals(tousseItemVo.getIsApplyEntireTousse())){
+			if (urgentAmount > 1){
+				return this.jsonOutput("加急数量不能大于1！",false);
+			}
+		}
+		return this.judgeUrgentAmountAndAmount(urgentAmount,amount);
+	}
+
+	/**
+	 * 比较加急数量和申请数量
+	 * @param urgentAmount 加急数量
+	 * @param amount 申请数量
+     * @return
+     */
+	private JSONObject judgeUrgentAmountAndAmount(Integer urgentAmount,Integer amount){
+		return amount < urgentAmount ? this.jsonOutput("加急数量不能大于申请数量",false) : null;
+	}
+
+	/**
+	 * json返回结果
+	 * @param message 要提示的信息
+	 * @param result true或者false
+     * @return
+     */
+	private JSONObject jsonOutput(String message,boolean result){
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("success", result);
+		jsonObject.put("message", message);
+		return jsonObject;
+	}
+
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r14266 -r14327
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14266)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14327)
@@ -2622,6 +2622,11 @@
 				} else {
 					tousseItem = tousseItemManager.getTousseItemById(""+id);
 				}
+				//如果urgentAmount不为空,则设置urgentAmount数量和状态
+				if (newItemVo.getUrgentAmount() != null){
+					tousseItem.setUrgentAmount(newItemVo.getUrgentAmount());
+					tousseItem.setUrgent(com.forgon.Constants.STR_YES);
+				}
 				tousseItem.setEditAmount(newItemVo.getAmount());
 				tousseItem.setPrice(newItemVo.getPrice());
 				tousseItem.setRowPrice(newItemVo.getRowPrice());
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r14251 -r14327
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 14251)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 14327)
@@ -19,6 +19,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.forgon.tools.string.StringTools;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
@@ -431,6 +432,15 @@
 	// 检查并创建还物单或通用申请单
 	private JSONObject createReturnApplicationOrRecyclingApplication() {
 		Collection<TousseItemVo> srcTousseItemVoList = getTousseItemVos();
+
+		//遍历提交的数据,如果加急数量大于申请数量则提示失败
+		for (TousseItemVo tousseItemVo : srcTousseItemVoList) {
+			JSONObject jsonObject = tousseDefinitionManager.handleUrgentAmountAndAmount(tousseItemVo);
+			if (jsonObject != null){
+				return jsonObject;
+			}
+		}
+		
 		boolean autoReturnTheBorrowingTousse = "true".equals(StrutsParamUtils
 				.getPraramValue("autoReturnTheBorrowingTousse", "").trim());
 		
@@ -921,6 +931,10 @@
 					boolean isTerminated = BooleanUtils.isTrue(tousseItem.getIsTerminated());
 					json.put("isTerminated", isTerminated);
 					json.put("checked", isTerminated);
+
+					//如果urgentAmount是空或者是0,则给页面返回空字符串
+					String urgentAmount = StringTools.handleNullOrZero(tousseItem.getUrgentAmount());
+					json.put("urgentAmount",urgentAmount);
 					
 					appendJsonString(rightStoreJson, json.toString());
 
@@ -1022,7 +1036,9 @@
 			if (tousseItem != null) {
 
 				String amountStr = tousseItem.getAmount().toString();
-				
+
+				String urgentAmount = StringTools.handleNullOrZero(tousseItem.getUrgentAmount());
+
 				applicationItemMap.remove(name);
 				Long itemId = tousseItem.getId();
 				
@@ -1044,6 +1060,7 @@
 					}
 				}
 
+				obj.put("urgentAmount", urgentAmount);
 				obj.put("count", amountStr);
 				obj.put("price", tousseItem.getPrice());
 				obj.put("totalPrice", tousseItem.getRowPrice());
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
===================================================================
diff -u -r14296 -r14327
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java	(.../TousseItemVo.java)	(revision 14296)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java	(.../TousseItemVo.java)	(revision 14327)
@@ -1,5 +1,7 @@
 package com.forgon.disinfectsystem.vo;
 
+import com.forgon.Constants;
+
 /**
  * @author WangYi
  *
@@ -51,6 +53,26 @@
 	
 	private Integer urgentAmount;// 加急数量
 
+	private Integer urgentAmount;// 加急数量
+
+	private String urgent = Constants.STR_NO;// 是否加急
+
+	public String getUrgent() {
+		return urgent;
+	}
+
+	public void setUrgent(String urgent) {
+		this.urgent = urgent;
+	}
+
+	public Integer getUrgentAmount() {
+		return urgentAmount;
+	}
+
+	public void setUrgentAmount(Integer urgentAmount) {
+		this.urgentAmount = urgentAmount;
+	}
+
 	public Long getId() {
 		return id;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
===================================================================
diff -u -r14177 -r14327
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 14177)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 14327)
@@ -233,4 +233,10 @@
 	 */
 	public JSONObject getDisinfectionMaterialInfo(TousseDefinition tousseDefinition);
 
+	/**
+	 * 判断加急数量是否大于申请数量,如果是消毒物品拆包的时候还要判断加急数量是否大于1
+	 * @param tousseItemVo 器械包vo
+	 * @return
+     */
+	JSONObject handleUrgentAmountAndAmount(TousseItemVo tousseItemVo);
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
===================================================================
diff -u -r14221 -r14327
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java	(.../DepartmentAppTemplateManagerImpl.java)	(revision 14221)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java	(.../DepartmentAppTemplateManagerImpl.java)	(revision 14327)
@@ -5,6 +5,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+import com.forgon.tools.string.StringTools;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -251,6 +252,7 @@
 		String amountStr = "";
 		String totalPriceStr = "";
 		Double price = 0d;
+		String urgentAmount = "";
 		
 		
 		
@@ -267,7 +269,10 @@
 			Double rowPrice = tousseItem.getRowPrice();
 			
 			totalPriceStr = rowPrice == null ? "" : rowPrice.toString();
-			
+
+			//如果urgentAmount是空或者是0,则给页面返回空字符串
+			urgentAmount = StringTools.handleNullOrZero(tousseItem.getUrgentAmount());
+
 		}
 		// 其他属性根据TousseDefinition赋值
 		if (tdOfTousseItem != null) {
@@ -315,6 +320,7 @@
 			}
 			
 
+			json.put("urgentAmount",urgentAmount);
 			json.put("id", itemId);
 			json.put("tousseDefinitionID", tdOfTousseItem.getId());
 			json.put("tousseType", tousseType);