Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28480 -r28481 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28480) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28481) @@ -2885,7 +2885,7 @@ msg = '不允许将包放入标识牌的篮筐中,请扫描其它的清洗篮筐!'; }else { var barcodesObj = JSON.parse($('#barcodes'+row).val()); - if(barcodesObj[0].containerBarcode == basketName.barcode){ + if(barcodesObj[0].containerBarcode !== basketsObj.barcode){ msg = '不允许将包放入标识牌的篮筐中,请扫描其它的清洗篮筐!'; } } @@ -2933,9 +2933,9 @@ break; } } - if(!isIdCardLost && amount > 0){ + if((!isIdCardLost && amount > 0) || amount < 0){ showMsg = $('#tousseName'+row).val()+"扫描的标识牌数量不等于回收数量,如果标识牌丢失,请在回收误差中登记丢失记录!"; - } + } }else{ var tousseAmount = parseInt($('#recycleAmount'+row).val(),10); var scannedAmount = parseInt($('#loadedAmount'+row).val(),10);