Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
===================================================================
diff -u -r18624 -r18625
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 18624)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 18625)
@@ -140,7 +140,7 @@
var amount = parseInt($('#errorAmount' + i).html());
var tousseBarcode = $('#tousseBarcode' + i).val();
var materialDefinitionId = $('#materialDefinitionId' + i).attr('value');
- var materialName = $('#materialName'+i).text();
+ var materialName = $('#sourceMaterialName' + i).attr('value');
if(amount > 0){
var item = {
materialName: materialName,
@@ -205,7 +205,7 @@
}else{
for(var i = 0;i < amount;i++){
items.push({
- src:'tousseImage.jsp?materialName='+materialName+"&number="+(i + 1),
+ src:'tousseImage.jsp?materialName='+materialName+"&number="+i,
type :'iframe'
});
}
@@ -230,13 +230,15 @@
function buildTableTR(amontPerTousse,materialDefinitionId,materialName,totalCount,errorCount,tousseBarcode){
var i = $("#recyclingDamageTable tbody tr").length;
+ var sourceMaterialName = materialName;
if(tousseBarcode != ""){
materialName += "
" + tousseBarcode;
}
var errorElement = $('