Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r31506 -r31519 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 31506) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 31519) @@ -1776,6 +1776,7 @@ if (!msg.isIDCardInstance) {//扫描器械包实例的条码 var ti = msg.tousseInstance; var td = ti.tousseDefinition; + var tousseDefinitionID = (td.tousseType == '消毒物品')?td.ancestorID:td.id; if (sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode) { var basketHideStr = $("#basketsUl li:first").find('input').val(); if (basketHideStr == null || basketHideStr == "") { @@ -1793,7 +1794,7 @@ alertDiv(barcode + ",已入筐!"); } else { var orgUnitName = $('#depart').text(); - var loadedAmount2 = tousseIntoBasketFunction(ti.id, td.id, td.name, 1, td.isCleanedEntirely, orgUnitName, "", ti.barcode, td.tousseType, -1, '否', 2, msg); + var loadedAmount2 = tousseIntoBasketFunction(ti.id, tousseDefinitionID, td.name, 1, td.isCleanedEntirely, orgUnitName, "", ti.barcode, td.tousseType, -1, '否', 2, msg); } } else { var isThereIdentificationCard = '否'; @@ -1802,12 +1803,12 @@ } var tmpRow = $("#tousseItemTable > tbody > tr").length; //获取子元素,不包含孙子及以下的元素 var timeStr = new Date().getTime(); - var errorDamageQmKey = td.id + "_" + timeStr; + var errorDamageQmKey = tousseDefinitionID + "_" + timeStr; var toussItem = { row: tmpRow, tousseItemId: '', tousseName: td.name, - tousseDefinitionID: td.id, + tousseDefinitionID: tousseDefinitionID, applicationAmount: 0, recycleAmount: 1, loadedAmount: 0,