Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r30001 -r30031 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 30001) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 30031) @@ -6056,7 +6056,7 @@ DWREngine.setAsync(false); RecyclingRecordTableManager.getRecyclingRecordById(id,function(record){ record = eval("("+record+")"); - if(record != null){ + if(record != null){ $("#id").val(record.id); $("#depart").text(record.depart); $("#recyclingUser").val(record.recyclingUser); @@ -6244,10 +6244,7 @@ var timeStr = new Date().getTime(); errorDamageQmKey = applicationitems[i].tousseDefinitionId + "_" + timeStr; } - var recyclingAmount = applicationitems[i].recyclingTempAmout; - if(!recyclingAmount){ - recyclingAmount = applicationitems[i].amount; - } + var recyclingAmount = applicationitems[i].recyclingTempAmout || 0; // 如果状态为已清点,则将回收数量改为已清点的数量,显示在界面上 if (recyclingStatus == '已清点'){ recyclingAmount = applicationitems[i].tallyAmount;