Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28393 -r28397 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28393) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28397) @@ -1051,7 +1051,7 @@ $(this).find('dl').children().each(function(){ if($(this).attr('type') == 'hidden'){ var hideStr = $(this).val(); - var json = JSON.parse(hideStr); + var json = JSON.parse(hideStr); if(json.tousseDefinitionID == tousseDefinitionID && json.idCardBarcode == idCardBarcode && json.tousseInstanceBarcode == tousseInstanceBarcode){ json.amount = (json.amount + amount); $(this).val(JSON.stringify(json)); @@ -1499,7 +1499,6 @@ }else{ var orgUnitName = $('#depart').val(); var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType); - if(loadedAmount2 > 0){ var tousseIsExist2 = false; $('#tousseItemTable').children().first().children().each(function(i,element){ @@ -1638,13 +1637,12 @@ } var loadedAmount = tousseIntoBasketFunction("",td.id,td.name,1,td.isCleanedEntirely,orgUnitName,barcode,"",td.tousseType); - if(loadedAmount >= 0){ var tousseIsExist = false; $('#tousseItemTable').children().first().children().each(function(i,element){ if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){ tousseIsExist = true; - $('#loadedAmount'+i).val(1 + parseInt($('#loadedAmount'+i).val(),10)); + $('#loadedAmount'+i).val(parseInt($('#loadedAmount'+i).val(),10)); $('#tousseOrIDCardInstanceBarcodes'+i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes'+i).val(), ti.barcode)); if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){ $('#recycleAmount'+i).val(parseInt($('#loadedAmount'+i).val())); @@ -2695,7 +2693,6 @@ } } } - if(isCleanedEntirely == "否"){ var materials = data.materials; if(materials == null){