Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r29667 -r29668 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29667) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29668) @@ -6227,7 +6227,6 @@ } } } - if(record.classifyBaskets != null){ for(var i = 0 ; i< record.classifyBaskets.length ; i++){ var basket = record.classifyBaskets[i]; @@ -6263,7 +6262,7 @@ showBarcode = tousseNameForMaterial; } - if((sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero) && ci.tousseInstanceBarcode != undefined){ + if(ci.tousseInstanceBarcode != undefined){ showBarcode = ci.tousseInstanceBarcode; } @@ -6290,7 +6289,7 @@ } var barcode = ci.idCardBarcode; - if((sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero) && ci.tousseInstanceBarcode != undefined){ + if(ci.tousseInstanceBarcode != undefined){ barcode = ci.tousseInstanceBarcode; } var element = '';