Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r29182 -r29183 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29182) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29183) @@ -196,7 +196,7 @@ if(t_basketBarcode == item.basketBarcode && itemType == t_itemType && t_tousseName == tousseName && t_tousseDefinitionID == item.tousseDefinitionID && t_idCardBarcode == idCardBarcode && t_tousseInstanceBarcode == tousseInstanceBarcode){ if(itemType == '材料' && (tousseNameForMaterial != t_tousseNameForMaterial || basketGroupBarcodes != t_basketGroupBarcodes)){ continue; - } + } tousseArray[i].amount = t_amount+amount; tousseArray[i].tousseAmountForMaterial = t_amountForMaterial + tousseAmountForMaterial; tousseArray[i].basketSequence = item.basketSequence; @@ -233,7 +233,7 @@ lastTousseInstanceId:lastTousseInstanceId, washClassifyType:washClassifyType }; - tousseArray.push(newTousse); + tousseArray.push(newTousse); } } } @@ -928,8 +928,8 @@ var barcodeElement = $(deleteButton).parent().prev().prev(); var amountElement = $(deleteButton).parent().prev(); var delElement = $(deleteButton).parent(); - var basketElement = $(deleteButton).parent().parent(); - var basketJSON = basketElement.prev().prev().prev().prev().prev(); + var basketElement = $(deleteButton).parent().parent().parent(); + var basketJSON = basketElement.find('input').eq(0); var basket = basketJSON.val()?JSON.parse(basketJSON.val()):{}; var item = hideElement.val()?JSON.parse(hideElement.val()):{}; var name = "";