Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r26370 -r26398
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 26370)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 26398)
@@ -604,7 +604,7 @@
 				blur:function(thiz, e, eOpts){
 					if(thiz.getValue() != null){//设置加急级别默认值
 						var urgentLevelData = top.Ext4.getCmp('urgentLevel').getStore().data.items;
-						for(var i = 0;i<urgentLevelData.length;i++){
+						for(var i = 0;i < urgentLevelData.length;i++){
 							var urgentDefaultValue = urgentLevelData[i].data.urgentDefaultValue;
 							if(urgentDefaultValue == "是"){
 								var urgentLevelVal = urgentLevelData[i].data.urgentLevel;
@@ -883,11 +883,11 @@
 						var tousseType = record.get('tousseType');
 						var isApplyEntireTousse = record.get('isApplyEntireTousse');
 						var urgentAmount = record.get('urgentAmount');
-						
 						if (isDiposableGoods == '是'){
 							if (checkDisposableGoodsAmountEvent(context)){
 								return;
 							}
+							
 							totalPrice = reCalculateTotalPriceAndSetUnitCount(record, context);
 						}
 
@@ -900,6 +900,14 @@
 							if (handleUrgentAmount.handleUaAndCount(urgentAmount, count)){
 								record.set("urgentAmount", originalValue);
 							}
+							
+							//一次性物品加急数量的校验
+							if(sstsConfig.enableUrgentFunction  && isDiposableGoods == '是'){
+								if (handleUrgentAmount.handleUrgentAmountDiposableGoods(context)){
+									record.set("urgentAmount", originalValue);
+								}
+							} 
+							
 							if (handleUrgentAmount.handleApplyEntireTousse(tousseType, isApplyEntireTousse, urgentAmount)){
 								record.set("urgentAmount", originalValue);
 							}
@@ -2041,6 +2049,24 @@
 			return true;
 		}
 		return false;
+	},
+	/**
+	 * 判断一次性物品的加急数量不能低于最小申请数量或者申请数量的倍数
+	 */
+	handleUrgentAmountDiposableGoods:function(context){
+		var record = context.record;
+		var urgentAmount = record.get('urgentAmount');
+		if(urgentAmount != "" && urgentAmount!= null && urgentAmount !=undefined){
+			var minApplyAmount = record.get("minApplyAmount");
+			var maxApplyAmount = record.get("maxApplyAmount");
+			
+			var checkCount = getMiddleAmount(urgentAmount);
+			if (!isValidDiposableAmount(minApplyAmount, checkCount)) {
+			    showResult("该一次性物品最小申请数量为" + minApplyAmount + ",所填加急数量必须是" + minApplyAmount + "的倍数。");
+			    return true;
+			}
+		}
+		return false;
 	}
 }
 
@@ -2090,7 +2116,7 @@
         	showResult("申请数量大于最大可申请数量" + maxApplyAmount);
         	record.set("count", context.originalValue);
             return true;
-        }
+        }		
     }
     return false;
 }