Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp =================================================================== diff -u -r29572 -r29610 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 29572) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp (.../updateAmount.jsp) (revision 29610) @@ -134,6 +134,11 @@ return; } if(inputObj.value != null && inputObj.value != "" && row != null && row != ''){ + if(window.parent.validateReduceAmount(inputObj.value,row).length > 0){ + var arr = window.parent.validateReduceAmount(inputObj.value,row); + alert('不能减少回收数量,请先检查【'+arr.join(',')+'】的丢失报损数量'); + return + } window.parent.openElement.value =inputObj.value; window.parent.changeRecycleAmount(row); if(window.parent.setTousseItemLoadedAmountCss){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r29607 -r29610 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29607) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29610) @@ -438,7 +438,7 @@ var recycleAmount = $('#recycleAmount'+row).val() == ''?0:parseInt($('#recycleAmount'+row).val(),10)-1; if(validateReduceAmount(recycleAmount,row).length > 0){ var arr = validateReduceAmount(recycleAmount,row); - alertDiv('不能减少回收数量,清先检查【'+arr.join(',')+'】的丢失报损数量'); + alertDiv('不能减少回收数量,请先检查【'+arr.join(',')+'】的丢失报损数量'); return } if(recycleAmount >= 0){