Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28820 -r28821 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28820) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28821) @@ -3263,15 +3263,21 @@ var b = true; $('#tousseItemTable').children().first().children().each(function(i,element){ if(($('#tousseDefinitionID'+i).val() == tousseDefinitionID)||(tousseType == '消毒物品' && $('#tousseName'+i).val() == tousseName)){ - //显示的列表中是否有该器械包 + //显示的列表中是否有该器械包 if($('#deleted'+i).val() == '0'){ - var enableUserManuallyCloseAddTousseWindow = sstsConfig.enableUserManuallyCloseAddTousseWindow || false; - - if(!enableUserManuallyCloseAddTousseWindow){ - alertDiv(tousseName + ",回收列表已存在!"); + if(barcode !== ''){ + var recycleAmount = parseInt($('#recycleAmount'+i).val()); + $('#recycleAmount'+i).val(recycleAmount+1); + b = false; + highlightExistTousseItem(i); + }else { + var enableUserManuallyCloseAddTousseWindow = sstsConfig.enableUserManuallyCloseAddTousseWindow || false; + if(!enableUserManuallyCloseAddTousseWindow){ + alertDiv(tousseName + ",回收列表已存在!"); + } + b = false; + highlightExistTousseItem(i); } - b = false; - highlightExistTousseItem(i); //删除后再添加该消毒物品,删除的项还原,原因是添加的消毒物品包定义和申请项的包定义不一样 }else if(tousseType == '消毒物品'){ $('#deleted'+i).val('0');