Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r32542 -r32700 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32542) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32700) @@ -3346,6 +3346,7 @@ if ($('#tousseName' + i).val() == td.name && $('#deleted' + i).val() == '0') { tousseIsExist2 = true; $('#loadedAmount' + i).val(loadedAmount + parseInt($('#loadedAmount' + i).val(), 10)); + console.log( ti.barcode) $('#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())); @@ -3386,14 +3387,17 @@ } } else if (callbackType == 3) { var ti = msgObj.tousseInstance; - var td = ti.tousseDefinition; + var idCardInstance = msgObj.idCardInstance; + var td = ti.tousseDefinition || ''; 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(loadedAmount + parseInt($('#loadedAmount' + i).val(), 10)); - $('#tousseOrIDCardInstanceBarcodes' + i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes' + i).val(), ti.barcode)); + if(idCardInstance && (idCardInstance.barcode == ti.barcode)){ + $('#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())); }