Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r24150 -r24643 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24150) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24643) @@ -1067,6 +1067,9 @@ if(!isValidDiposableAmount(minApplyAmount,count)){ showResult("该一次性物品最小申请数量为"+minApplyAmount+",所填数量必须是"+minApplyAmount+"的倍数。"); return false; + }else if(!isUndefinedOrNullOrEmpty(maxApplyAmount) && count > maxApplyAmount){ + showResult("该一次性物品最大申请数量为"+maxApplyAmount+",申请数量不能大于最大申请数量。"); + return false; }else if(parseInt(checkCount,10) > storageAmount){ if(!allowApplyDisposableGoodsWhenUnderstock){ showResult("申请数量不能大于库存数量!"); @@ -1080,10 +1083,6 @@ afterAddItem(true); } }); - }else if(!isUndefinedOrNullOrEmpty(maxApplyAmount) && count > maxApplyAmount){ - top.Ext4.Msg.alert("提示消息","申请数量大于最大可申请数量"); - addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,originalPrice,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para,expressInvoice); - afterAddItem(true); }else{ addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,originalPrice,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para,expressInvoice); afterAddItem(true);