Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js =================================================================== diff -u -r40996 -r40997 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js (.../expressRecycleForTouchScreen.js) (revision 40996) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js (.../expressRecycleForTouchScreen.js) (revision 40997) @@ -732,6 +732,12 @@ function putTousseInTheBasketForChild(row) { var childCount = $('#childCount' + row).val(); var sumAmount = 0; + var loadedAmount = $('#loadedAmount' + row).val(); + var recycleAmount = $('#recycleAmount' + row).val(); + if (loadedAmount == recycleAmount) { + alertDiv('没有可以放入篮筐的器械包。'); + return + } for (var i = 0; i < childCount; i++) { var loadedAmount = $('#loadedAmount' + row + '_' + i).val(); var recycleAmount = $('#recycleAmount' + row + '_' + i).val(); @@ -740,11 +746,6 @@ sumAmount += parseInt(recycleAmount); } } - var loadedAmount = $('#loadedAmount' + row).val(); - if (loadedAmount > 0) { - alertDiv('没有可以放入篮筐的器械包。'); - return - } if (sumAmount > 0) { $('#loadedAmount' + row).val(sumAmount); }